diff --git a/Apply-suggestoin-about-wprintw-and-autoupdate-from-Geroges.pacth b/Apply-suggestoin-about-wprintw-and-autoupdate-from-Geroges.pacth deleted file mode 100644 index 4897619..0000000 --- a/Apply-suggestoin-about-wprintw-and-autoupdate-from-Geroges.pacth +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur a/src/partclone.c b/src/partclone.c ---- a/src/partclone.c 2022-03-10 18:54:27.177629520 +0800 -+++ b/src/partclone.c 2022-03-10 18:54:05.473272293 +0800 -@@ -839,7 +839,7 @@ - if (log_exit) - wattron(log_win, A_STANDOUT); - -- wprintw(log_win, tmp_str); -+ wprintw(log_win, "%s", tmp_str); - - if (log_exit) { - wattroff(log_win, A_STANDOUT); diff --git a/partclone-0.3.12-gcc10.patch b/partclone-0.3.12-gcc10.patch deleted file mode 100644 index fbc2790..0000000 --- a/partclone-0.3.12-gcc10.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 7638e1937083f6da076e5c469c14acc32f65ba49 Mon Sep 17 00:00:00 2001 -From: Robert Scheck -Date: Sun, 2 Feb 2020 23:13:06 +0100 -Subject: [PATCH] Declare variables as extern in headers (fixes #136) - -GCC 10 compatibility as per https://gcc.gnu.org/gcc-10/porting_to.html - -See also: - - https://github.com/Thomas-Tsai/partclone/issues/136 - - https://github.com/Thomas-Tsai/partclone/pull/137 ---- - src/partclone.c | 1 + - src/partclone.h | 4 ++-- - src/xfsclone.c | 2 +- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/partclone.c b/src/partclone.c -index 98365043..e264cbb1 100644 ---- a/src/partclone.c -+++ b/src/partclone.c -@@ -55,6 +55,7 @@ - - - FILE* msg = NULL; -+unsigned long long rescue_write_size; - #ifdef HAVE_LIBNCURSESW - #include - WINDOW *log_win; -diff --git a/src/partclone.h b/src/partclone.h -index 5188e290..3dc2ef1b 100644 ---- a/src/partclone.h -+++ b/src/partclone.h -@@ -80,8 +80,8 @@ const char* get_exec_name(); - #undef crc32 - #endif - --char *EXECNAME; --unsigned long long rescue_write_size; -+extern char *EXECNAME; -+extern unsigned long long rescue_write_size; - - /** - * option -diff --git a/src/xfsclone.c b/src/xfsclone.c -index 522431ab..6f807e90 100644 ---- a/src/xfsclone.c -+++ b/src/xfsclone.c -@@ -24,7 +24,7 @@ - #undef crc32 - int source_fd = -1; - int first_residue; --progress_bar prog; -+extern progress_bar prog; - unsigned long long checked; - unsigned long long total_block; - int bitmap_done = 0; diff --git a/partclone-0.3.12.tar.gz b/partclone-0.3.12.tar.gz deleted file mode 100644 index 45f5a4d..0000000 Binary files a/partclone-0.3.12.tar.gz and /dev/null differ diff --git a/partclone-0.3.27.tar.gz b/partclone-0.3.27.tar.gz new file mode 100644 index 0000000..2452db6 Binary files /dev/null and b/partclone-0.3.27.tar.gz differ diff --git a/partclone.spec b/partclone.spec index e67cc50..dfe8f93 100644 --- a/partclone.spec +++ b/partclone.spec @@ -3,8 +3,8 @@ Summary: Utility to clone and restore a partition Name: partclone -Version: 0.3.12 -Release: 4 +Version: 0.3.27 +Release: 1 # Partclone itself is GPLv2+ but uses other source codes, breakdown: # GPLv3+: fail-mbr/fail-mbr.S # GPLv2 and GPLv2+: src/btrfs* @@ -17,9 +17,6 @@ Release: 4 License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2 and LGPLv2+ URL: http://partclone.org/ Source0: https://github.com/Thomas-Tsai/partclone/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: partclone-0.3.12-gcc10.patch -#https://github.com/Thomas-Tsai/partclone/commit/5c2f2fc71e6d4569bc94c4d6c265a01a5ef6bf1a -Patch1: Apply-suggestoin-about-wprintw-and-autoupdate-from-Geroges.pacth BuildRequires: gcc BuildRequires: libuuid-devel BuildRequires: fuse-devel @@ -33,11 +30,18 @@ BuildRequires: e2fsprogs BuildRequires: ntfsprogs BuildRequires: dosfstools BuildRequires: hfsplus-tools +BuildRequires: xfsprogs +BuildRequires: btrfs-progs +BuildRequires: f2fs-tools %endif BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel +Provides: bundled(libbtrfs) +Provides: bundled(libbtrfsutil) +Provides: bundled(xfsprogs-libs) + %description Partclone provides utilities to clone and restore used blocks on a partition and is designed for higher compatibility of the file system by using existing @@ -90,24 +94,27 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/ sed -e 's/256/1440/' -i tests/_common # Tests for Btrfs, XFS and F2FS filesystems are broken on all architectures -sed -e 's/^\(am__append_2 = btrfs.test\)/#\1/' \ - -e 's/^\(am__append_6 = xfs.test\)/#\1/' \ - -e 's/^\(am__append_8 = f2fs.test\)/#\1/' \ - -e 's/^\(am__append_11 = btrfs.test\)/#\1/' \ +sed -e 's/^\(am__append_[[:digit:]]* = btrfs.test\)/#\1/' \ + -e 's/^\(am__append_[[:digit:]]* = xfs.test\)/#\1/' \ + -e 's/^\(am__append_[[:digit:]]* = f2fs.test\)/#\1/' \ + -e 's/^\(am__append_[[:digit:]]* = btrfs.test\)/#\1/' \ -i tests/Makefile # NILFS2 tests must be run as root (mockbuild is unprivileged) -sed -e 's/^\(am__append_13 = nilfs2.test\)/#\1/' \ +sed -e 's/^\(am__append_[[:digit:]]* = nilfs2.test\)/#\1/' \ + -i tests/Makefile + +# Reiser4 tests require reiser4progs (which are not packaged) +sed -e 's/^\(am__append_[[:digit:]]* = reiser4.test\)/#\1/' \ -i tests/Makefile # Tests for FAT and HFS+ filesystems are broken on ppc64 and s390x %ifarch ppc64 s390x -sed -e 's/^\(am__append_3 = fat.test\)/#\1/' \ - -e 's/^\(am__append_5 = hfsplus.test\)/#\1/' \ +sed -e 's/^\(am__append_[[:digit:]]* = fat.test\)/#\1/' \ + -e 's/^\(am__append_[[:digit:]]* = hfsplus.test\)/#\1/' \ -i tests/Makefile %endif - make check || (cat tests/test-suite.log; exit 1) %endif @@ -121,6 +128,9 @@ make check || (cat tests/test-suite.log; exit 1) %{_mandir}/man8/%{name}*.8* %changelog +* Mon Oct 09 2023 yaoxin - 0.3.27-1 +- Upgrade to 0.3.27 + * Thu Mar 10 2022 liyanan - 0.3.12-4 - Fix build error