The package rpms/partclone.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/partclone.git/commit/?id=b0c17603....
Change:
-%ifarch ppc64
Thanks.
Full change:
============
commit 973852b780a273c6f92de5dc3234d52c86776374
Author: Robert Scheck <robert(a)fedoraproject.org>
Date: Wed Dec 30 23:41:44 2020 +0100
Upgrade to 0.3.17 (#1911716)
diff --git a/partclone-0.3.12-c99-for-loop.patch b/partclone-0.3.12-c99-for-loop.patch
deleted file mode 100644
index b723983..0000000
--- a/partclone-0.3.12-c99-for-loop.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Backported patch by Robert Scheck <robert(a)fedoraproject.org> for partclone >=
0.3.12 which removes
-C99 syntax in for loop.
-
-Upstream:
https://github.com/Thomas-Tsai/partclone/commit/2cab14ef0c05fde5ef2daaf91...
-
---- partclone-0.3.12/src/main.c 2018-10-28 14:46:38.000000000 +0100
-+++ partclone-0.3.12/src/main.c.c99-for-loop 2019-07-23 01:02:45.280856010 +0200
-@@ -766,7 +766,8 @@
- // finish a piece
- SHA1_Final(hash, &ctx);
- dprintf(tinfo, "sha1: ");
-- for (int x = 0; x < SHA_DIGEST_LENGTH; x++) {
-+ int x = 0;
-+ for (x = 0; x < SHA_DIGEST_LENGTH; x++) {
- dprintf(tinfo, "%02x", hash[x]);
- }
- dprintf(tinfo, "\n");
-@@ -818,7 +819,8 @@
- if (sha_length) {
- SHA1_Final(hash, &ctx);
- dprintf(tinfo, "sha1: ");
-- for (int x = 0; x < SHA_DIGEST_LENGTH; x++) {
-+ int x = 0;
-+ for (x = 0; x < SHA_DIGEST_LENGTH; x++) {
- dprintf(tinfo, "%02x", hash[x]);
- }
- dprintf(tinfo, "\n");
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 <robert(a)fedoraproject.org>
-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 <ncurses.h>
- 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.17-c99-for-loop.patch b/partclone-0.3.17-c99-for-loop.patch
new file mode 100644
index 0000000..62edf31
--- /dev/null
+++ b/partclone-0.3.17-c99-for-loop.patch
@@ -0,0 +1,45 @@
+From 58e56e358b75977c52c340484f0eba403183d3c8 Mon Sep 17 00:00:00 2001
+From: Robert Scheck <robert(a)fedoraproject.org>
+Date: Wed, 30 Dec 2020 23:02:32 +0100
+Subject: [PATCH] Change C99 for loop init to C89 for compatibility
+
+Upstream:
https://github.com/Thomas-Tsai/partclone/pull/152
+---
+ src/torrent_helper.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/torrent_helper.c b/src/torrent_helper.c
+index c7422c68..f7516ea4 100644
+--- a/src/torrent_helper.c
++++ b/src/torrent_helper.c
+@@ -30,6 +30,7 @@ void torrent_update(torrent_generator *torrent, void *buffer, size_t
length)
+ unsigned long long buffer_offset = 0;
+
+ int tinfo = torrent->tinfo;
++ int x = 0;
+
+ while (buffer_remain_length > 0) {
+ sha_remain_length = BT_PIECE_SIZE - sha_length;
+@@ -37,7 +38,7 @@ void torrent_update(torrent_generator *torrent, void *buffer, size_t
length)
+ // finish a piece
+ SHA1_Final(torrent->hash, &torrent->ctx);
+ dprintf(tinfo, "sha1: ");
+- for (int x = 0; x < SHA_DIGEST_LENGTH; x++) {
++ for (x = 0; x < SHA_DIGEST_LENGTH; x++) {
+ dprintf(tinfo, "%02x", torrent->hash[x]);
+ }
+ dprintf(tinfo, "\n");
+@@ -67,10 +68,12 @@ void torrent_update(torrent_generator *torrent, void *buffer, size_t
length)
+
+ void torrent_final(torrent_generator *torrent)
+ {
++ int x = 0;
++
+ if (torrent->length) {
+ SHA1_Final(torrent->hash, &torrent->ctx);
+ dprintf(torrent->tinfo, "sha1: ");
+- for (int x = 0; x < SHA_DIGEST_LENGTH; x++) {
++ for (x = 0; x < SHA_DIGEST_LENGTH; x++) {
+ dprintf(torrent->tinfo, "%02x", torrent->hash[x]);
+ }
+ dprintf(torrent->tinfo, "\n");
diff --git a/partclone.spec b/partclone.spec
index 7533a97..37e9025 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: 5%{?dist}
+Version: 0.3.17
+Release: 1%{?dist}
# Partclone itself is GPLv2+ but uses other source codes, breakdown:
# GPLv3+: fail-mbr/fail-mbr.S
# GPLv2 and GPLv2+: src/btrfs*
@@ -17,9 +17,9 @@ Release: 5%{?dist}
License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2 and LGPLv2+
URL:
https://partclone.org/
Source0:
https://github.com/Thomas-Tsai/partclone/archive/%{version}/%{name}-%{ver...
-Patch0: partclone-0.3.12-c99-for-loop.patch
-Patch1: partclone-0.3.12-gcc10.patch
+Patch0: partclone-0.3.17-c99-for-loop.patch
BuildRequires: gcc
+BuildRequires: make
BuildRequires: libuuid-devel
BuildRequires: fuse-devel
BuildRequires: ncurses-devel
@@ -56,10 +56,15 @@ libraries, e.g. e2fslibs is used to read and write the ext2
partition.
%prep
%setup -q
%patch0 -p1 -b .c99-for-loop
-%patch1 -p1 -b .gcc10
autoreconf -i -f
%build
+# src/progress.c:50: undefined reference to `__fpclassifyf',
+# reported:
https://github.com/Thomas-Tsai/partclone/issues/153
+%if 0%{?rhel} == 7
+export LDFLAGS="$RPM_LD_FLAGS -lm"
+%endif
+
%configure \
--enable-extfs \
--enable-xfs \
@@ -137,6 +142,9 @@ make check || (cat tests/test-suite.log; exit 1)
%{_mandir}/man8/%{name}*.8*
%changelog
+* Wed Dec 30 2020 Robert Scheck <robert(a)fedoraproject.org> 0.3.17-1
+- Upgrade to 0.3.17 (#1911716)
+
* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.12-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 802fd40..12dd579 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (partclone-0.3.12.tar.gz) =
72ff450ab1ca9c30a5c2404cd2f92110ec298f1cfab79610cbcd5272ded72e8e9cb758a980f4d6d05f848dde9058753748bdb6616b2f9bf7c1742a3c65f19500
+SHA512 (partclone-0.3.17.tar.gz) =
a9d7cc1601d485530c2c92621fed56c25ec75bf0ed06d403de86a282b34ec6aa961bf90c9c6ab3a9476de8bfe168d59b2b5c85623aea5aac8ea50d6798d54f53
commit b0c17603416f6d5b3d24751f55d5c4b38d05cdee
Author: Robert Scheck <robert(a)fedoraproject.org>
Date: Wed Dec 30 21:38:15 2020 +0100
Remove support for Red Hat Enterprise Linux 6
diff --git a/partclone.spec b/partclone.spec
index 45155b6..7533a97 100644
--- a/partclone.spec
+++ b/partclone.spec
@@ -15,7 +15,7 @@ Release: 5%{?dist}
# LGPLv2+: src/gettext.h
# Unused source code (= not built): src/{exfat,jfs,reiser,ufs,vmfs}*
License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2 and LGPLv2+
-URL:
http://partclone.org/
+URL:
https://partclone.org/
Source0:
https://github.com/Thomas-Tsai/partclone/archive/%{version}/%{name}-%{ver...
Patch0: partclone-0.3.12-c99-for-loop.patch
Patch1: partclone-0.3.12-gcc10.patch
@@ -34,12 +34,8 @@ BuildRequires: nilfs-utils-devel
BuildRequires: e2fsprogs
BuildRequires: ntfsprogs
BuildRequires: dosfstools
-%if 0%{?fedora} || 0%{?rhel} >= 7
-# RHEL 6 provides xfsprogs RPM only as part of Resilient Storage Add-On
BuildRequires: xfsprogs
-%endif
%if 0%{?fedora} || 0%{?rhel} == 7
-# RHEL 6 provides btrfs-progs RPM only on x86_64 architecture as it seems
# RHEL 8 (including EPEL 8) doesn't provide any btrfs-progs RPM at all
BuildRequires: btrfs-progs
%endif
@@ -64,14 +60,6 @@ libraries, e.g. e2fslibs is used to read and write the ext2 partition.
autoreconf -i -f
%build
-# /usr/include/asm/types.h:31 and xfs/platform_defs.h:50 try both to define
-# umode_t, reported:
https://github.com/Thomas-Tsai/partclone/issues/96
-%if 0%{?rhel} == 6
-%ifarch ppc64
-export CFLAGS="$RPM_OPT_FLAGS -DHAVE_UMODE_T"
-%endif
-%endif
-
%configure \
--enable-extfs \
--enable-xfs \