backport-fix-building-against-gcc-10.patch

@@ -1,85 +0,0 @@
-From e48d079f0386c6630d107897e689ea6c4511479f Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 20 Aug 2020 19:34:45 +0200
-Subject: sys-fs/jfsutils: fix building against gcc-10
-
-Closes: https://bugs.gentoo.org/707314
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- fscklog/display.c |  2 +-
- libfs/logredo.c   | 21 +++++++++++----------
- 2 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/fscklog/display.c b/fscklog/display.c
-index a33d44f..dadd07f 100644
---- a/fscklog/display.c
-+++ b/fscklog/display.c
-@@ -54,7 +54,7 @@ FILE *infp;
-  * output: fsck extracted service log I/O buffer
-  *
-  */
--char xchklog_buffer[XCHKLOG_BUFSIZE];
-+static char xchklog_buffer[XCHKLOG_BUFSIZE];
- 
- /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-  *
-diff --git a/libfs/logredo.c b/libfs/logredo.c
-index eb897e8..d6204b7 100644
---- a/libfs/logredo.c
-+++ b/libfs/logredo.c
-@@ -87,9 +87,9 @@ int32_t bmap_stg_bytes = 0;
-  *    S T U F F    F O R    T H E    L O G
-  *
-  */
--struct logsuper logsup;		/* log super block */
--int32_t numdoblk;		/* number of do blocks used     */
--int32_t numnodofile;		/* number of nodo file blocks used  */
-+static struct logsuper logsup;		/* log super block */
-+static int32_t numdoblk;		/* number of do blocks used     */
-+static int32_t numnodofile;		/* number of nodo file blocks used  */
- int32_t numExtDtPg = 0;		/* number of extended dtpage blocks used  */
- 
- /*
-@@ -129,7 +129,7 @@ int32_t use_2ndary_agg_superblock;
-  */
- 
- /* buffer header table */
--struct bufhdr {
-+static struct bufhdr {
- 	int16_t next;		/* 2: next on free/lru list */
- 	int16_t prev;		/* 2: previous on free/lru list */
- 	int16_t hnext;		/* 2: next on hash chain */
-@@ -142,7 +142,7 @@ struct bufhdr {
- } bufhdr[NBUFPOOL];		/* (24) */
- 
- /* buffer table */
--struct bufpool {
-+static struct bufpool {
- 	char bytes[PSIZE];
- } buffer[NBUFPOOL - 1];
- 
-@@ -151,15 +151,16 @@ struct bufpool {
-  *
-  * log has its own 4 page buffer pool.
-  */
--uint8_t afterdata[LOGPSIZE * 2];	/* buffer to read in redopage data */
-+static uint8_t afterdata[LOGPSIZE * 2];	/* buffer to read in redopage data */
- 
- /*
-  * Miscellaneous
-  */
--caddr_t prog;			/* Program name */
--int32_t mntcnt, bufsize;
--char *mntinfo;
--int32_t retcode;		/* return code from logredo    */
-+static caddr_t prog;			/* Program name */
-+static int32_t mntcnt;
-+static int32_t bufsize;
-+static char *mntinfo;
-+static int32_t retcode;		/* return code from logredo    */
- int end_of_transaction = 0;
- 
- /*
--- 
-1.8.3.1
-

jfsutils.spec

@@ -1,15 +1,14 @@
 Name:          jfsutils
 Version:       1.1.15
-Release:       18
+Release:       14
 Summary:       Administration and debugging tools for the JFS filesystem
 License:       GPLv3
 URL:           http://jfs.sourceforge.net/
 Source0:       http://jfs.sourceforge.net/project/pub/jfsutils-1.1.15.tar.gz
 Patch0001:     jfsutils-1.1.15-linux-headers.patch
 Patch0002:     jfsutils_sysmacros.patch
-Patch6000:     backport-fix-building-against-gcc-10.patch
 Patch9000:     jfsutils-reslove-build-error.patch
-Buildrequires: libuuid-devel git  gcc
+Buildrequires: libuuid-devel git gdb
 
 %description
 JFS(IBM's Journaled File System) is used in IBM enterprise servers,
@@ -20,7 +19,7 @@ filesystem, which mainly contains a number of utilities for creating,
 checking, modifying, and correcting any inconsistencies in JFS filesystems.
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version} -p1 -Sgit
 
 %build
 %configure 
@@ -41,26 +40,5 @@ rm -rf $RPM_BUILD_ROOT
 %license COPYING
 
 %changelog
-* Thu Jun 16 2022 tanyulong <tanyulong@kylinos.cn> - 1.1.15-18
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:Delete unnecessary gdb from BuildRequires
-
-* Sat Jul 31 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.1.15-17
-- DESC: delete -Sgit from %autosetup
-
-* Sat Jul 31 2021 shixuantong<shixuantong@huawei.com> - 1.1.15-16
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC:fix building against gcc-10
-
-* Wed Jun 23 2021 yuanxin<yuanxin24@huawei.com> - 1.1.15-15
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC:add buildrequires gcc
-
 * Fri Feb 14 2020 gulining<gulining1@openeuler.org> - 1.1.15-14
 - Package init

jfsutils.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: pld-linux/jfsutils
-tag_prefix: ^.*jfsutils- 
-seperator: .