diff --git a/.gitignore b/.gitignore index 18d61db..3ab1521 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -xa-2.3.5.tar.gz -/xa-2.3.6.tar.gz -/xa-2.3.7.tar.gz -/xa-2.3.8.tar.gz -/xa-2.3.9.tar.gz +/xa-*.tar.gz diff --git a/sources b/sources index cf7128a..6203b8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xa-2.3.9.tar.gz) = 9e140192f7daae8b5042a01c81c85f6ec4e53c727fa5af624fbe94a8ce85fbf821a1ee94dc9c11e8087b08a4060010b989f95b77cbcd2b550ab552c3b5455dfe +SHA512 (xa-2.4.1.tar.gz) = aaec796bec362ab253abc33320cb36ef879fa661c2091c7e3b2ce96ccc56063c59335fb7eb1d6a3de9486ab8973cbbc71c445e1ef816572a55a1338ffed19dc0 diff --git a/xa-2.3.7-make.patch b/xa-2.4.0-make.patch similarity index 78% rename from xa-2.3.7-make.patch rename to xa-2.4.0-make.patch index 780d3bb..4f1ed8b 100644 --- a/xa-2.3.7-make.patch +++ b/xa-2.4.0-make.patch @@ -1,6 +1,6 @@ -diff -up xa-2.3.7/Makefile.make xa-2.3.7/Makefile ---- xa-2.3.7/Makefile.make 2014-12-27 19:45:21.000000000 +0100 -+++ xa-2.3.7/Makefile 2015-01-03 15:36:18.000000000 +0100 +diff -up xa-2.4.0/Makefile.orig xa-2.4.0/Makefile +--- xa-2.4.0/Makefile.orig 2024-03-05 17:27:55.563481964 +0100 ++++ xa-2.4.0/Makefile 2024-03-05 17:28:10.411717189 +0100 @@ -17,11 +17,12 @@ LDFLAGS = -lc #CFLAGS = #LD = ld @@ -18,8 +18,8 @@ diff -up xa-2.3.7/Makefile.make xa-2.3.7/Makefile MKDIR = mkdir -p INSTALL = install -@@ -58,8 +59,8 @@ clean: - install: xa uncpk +@@ -63,8 +63,8 @@ clean: + install: all $(MKDIR) $(BINDIR) $(MKDIR) $(MANDIR) - $(INSTALL) xa reloc65 ldo65 file65 printcbm uncpk $(BINDIR) diff --git a/xa.spec b/xa.spec index 42ac266..0b09c58 100644 --- a/xa.spec +++ b/xa.spec @@ -1,13 +1,14 @@ Name: xa -Version: 2.3.9 -Release: 1%{?dist} +Version: 2.4.1 +Release: 6%{?dist} Summary: 6502/65816 cross-assembler -License: GPLv2+ +License: GPL-2.0-or-later URL: http://www.floodgap.com/retrotech/xa/ Source0: http://www.floodgap.com/retrotech/%{name}/dists/%{name}-%{version}.tar.gz # update the build system, reported in private email -Patch0: %{name}-2.3.7-make.patch +Patch0: %{name}-2.4.0-make.patch +BuildRequires: make BuildRequires: gcc # Perl needed for test-suite BuildRequires: perl-generators @@ -31,11 +32,10 @@ Key amongst its features: %prep -%setup -q -%patch0 -p1 -b .make +%autosetup -p1 # fix encoding -for f in ChangeLog doc/fileformat.txt +for f in ChangeLog do iconv -f ISO-8859-1 -t UTF-8 < $f > $f.new touch -r $f $f.new @@ -44,7 +44,7 @@ done %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +%make_build CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" %check @@ -52,16 +52,86 @@ make test %install -make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} INSTALL="install -p" +%make_install PREFIX=%{_prefix} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" %files -%doc COPYING ChangeLog README.1st doc/fileformat.txt +%doc COPYING ChangeLog README.1st %{_bindir}/* %{_mandir}/man1/* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 2.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 2.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 2.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 2.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Mar 06 2024 Fedora Release Monitoring - 2.4.1-1 +- Update to 2.4.1 (rhbz#2268042) + +* Tue Mar 05 2024 Dan Horák - 2.4.0-1 +- updated to version 2.4.0 + +* Sat Jan 27 2024 Fedora Release Engineering - 2.3.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 2.3.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Feb 16 2023 Dan Horák - 2.3.14-1 +- updated to version 2.3.14 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.3.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Aug 14 2022 Dan Horák - 2.3.13-1 +- updated to version 2.3.13 + +* Sat Jul 23 2022 Fedora Release Engineering - 2.3.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.3.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.3.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 2.3.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.3.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Tom Stellard - 2.3.11-3 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Thu May 07 2020 Dan Horák - 2.3.11-2 +- rebuilt with new source archive + +* Tue May 05 2020 Dan Horák - 2.3.11-1 +- updated to version 2.3.11 + +* Thu Jan 30 2020 Dan Horák - 2.3.10-2 +- fix build with gcc 10 + +* Tue Jan 28 2020 Lars Kellogg-Stedman - 2.3.10-1 +- updated to version 2.3.10 + +* Sat Jul 27 2019 Fedora Release Engineering - 2.3.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 09 2019 Dan Horák - 2.3.9-1 - updated to version 2.3.9