New upstream #2

.gitignore

@@ -1,2 +1,6 @@
 xar-1.5.2.tar.gz
+<<<<<<< HEAD
+/xar-xar-1.6.1.tar.gz
+=======
 /xar-417.1.tar.gz
+>>>>>>> master

xar.spec

@@ -2,13 +2,11 @@
 
 Name:           xar
 Version:        1.8.0.%{subversion}
-Release:        20%{?dist}
+Release:        1%{?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
 BuildRequires:  gcc
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
@@ -16,6 +14,8 @@ BuildRequires:  zlib-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  gawk
 BuildRequires:  autoconf
+ExcludeArch:    aarch64
+ExcludeArch:    ppc64le
 
 
 #First 4 patches taken from Gentoo Xar package. To make Xar more suitable for Linux systems
@@ -50,11 +50,11 @@ 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
 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 +62,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,63 +90,6 @@ popd
 
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.8.0.417.1-19
-- Rebuilt for openssl 4.0
-
-* Wed Feb 04 2026 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.8.0.417.1-18
-- update gnu-config files to make it build on riscv64
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.8.0.417.1-14
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan 16 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.8.0.417.1-9
-- Enable build on aarch64, ppc64le
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.8.0.417.1-6
-- Rebuilt with OpenSSL 3.0.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0.417.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Sat Jan 25 2020 Mosaab Alzoubi <moceap[AT]hotmail[DOT]com> - 1.8.0.417.1-1
 - Use Apple upstream instead of non-fresh Github one
 - New upstream in 1.8 dev branch with 417.1 subversion