diff --git a/xar-1.8-gnuconfig.patch b/xar-1.8-gnuconfig.patch new file mode 100644 index 0000000..9e4649d --- /dev/null +++ b/xar-1.8-gnuconfig.patch @@ -0,0 +1,36 @@ +--- a/config.guess 2006-04-19 16:46:22.000000000 -0400 ++++ b/config.guess 2021-07-04 19:33:12.857566034 -0400 +@@ -882,6 +882,15 @@ + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; ++ ppc64le:Linux:*:*) ++ echo powerpc64le-unknown-linux-gnu ++ exit ;; ++ aarch64:Linux:*:*) ++ echo aarch64-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ echo aarch64_be-unknown-linux-gnu ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +--- a/config.sub 2006-04-19 16:46:22.000000000 -0400 ++++ b/config.sub 2021-07-04 19:34:44.072681790 -0400 +@@ -228,6 +228,7 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +@@ -301,6 +302,7 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ diff --git a/xar.spec b/xar.spec index d206546..c4801b1 100644 --- a/xar.spec +++ b/xar.spec @@ -2,10 +2,9 @@ Name: xar Version: 1.8.0.%{subversion} -Release: 20%{?dist} +Release: 11%{?dist} Summary: The eXtensible ARchiver -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD URL: https://opensource.apple.com/source/xar Source: https://opensource.apple.com/tarballs/xar/xar-%{subversion}.tar.gz BuildRequires: make @@ -26,6 +25,7 @@ Patch2: xar-1.8-arm-ppc.patch Patch3: xar-1.8-openssl-1.1.patch Patch4: xar-1.8-Add-OpenSSL-To-Configuration.patch +Patch5: xar-1.8-gnuconfig.patch %description @@ -50,11 +50,12 @@ Development files for the eXtensible ARchiver. %prep %setup -n xar-%{subversion} pushd xar -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 sed 's:-Wl,-rpath,::g' -i configure.ac #No rpath sed 's:filetree.h:../lib/filetree.h:g' -i src/xar.c #Fix path sed 's:util.h:../lib/util.h:g' -i src/xar.c #Fix path @@ -62,7 +63,6 @@ popd %build pushd xar -cp /usr/lib/rpm/redhat/config.{guess,sub} . env NOCONFIGURE=1 ./autogen.sh %configure --disable-static make %{?_smp_mflags} @@ -91,33 +91,6 @@ popd %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.8.0.417.1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jun 13 2026 Yaakov Selkowitz - 1.8.0.417.1-19 -- Rebuilt for openssl 4.0 - -* Wed Feb 04 2026 Marcin Juszkiewicz - 1.8.0.417.1-18 -- update gnu-config files to make it build on riscv64 - -* Sat Jan 17 2026 Fedora Release Engineering - 1.8.0.417.1-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.8.0.417.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.8.0.417.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Sep 04 2024 Miroslav Suchý - 1.8.0.417.1-14 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.8.0.417.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.8.0.417.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Sat Jul 22 2023 Fedora Release Engineering - 1.8.0.417.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild