diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index dcfb9f3..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -xa-2.3.5.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3ab1521 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/xa-*.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 9ec5624..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xa -# $Id$ -NAME := xa -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 03df594..6203b8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -edd15aa8674fb86225faf34e56d5cab2 xa-2.3.5.tar.gz +SHA512 (xa-2.4.1.tar.gz) = aaec796bec362ab253abc33320cb36ef879fa661c2091c7e3b2ce96ccc56063c59335fb7eb1d6a3de9486ab8973cbbc71c445e1ef816572a55a1338ffed19dc0 diff --git a/xa-2.3.5-getline.patch b/xa-2.3.5-getline.patch deleted file mode 100644 index 92a1633..0000000 --- a/xa-2.3.5-getline.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nrup xa-2.3.5.orig/src/xa.c xa-2.3.5/src/xa.c ---- xa-2.3.5.orig/src/xa.c 2009-01-21 17:57:32.000000000 +0100 -+++ xa-2.3.5/src/xa.c 2009-03-31 16:47:33.000000000 +0200 -@@ -87,7 +87,7 @@ static int pass2(void); - static int puttmp(int); - static int puttmps(signed char *, int); - static void chrput(int); --static int getline(char *); -+static int xgetline(char *); - static void lineout(void); - static long ga_p1(void); - static long gm_p1(void); -@@ -763,7 +763,7 @@ static int pass1(void) - temp_er = 0; - - /*FIXIT*/ -- while(!(er=getline(s))) -+ while(!(er=xgetline(s))) - { - er=t_p1((signed char*)s,o,&l,&al); - switch(segment) { -@@ -1002,7 +1002,7 @@ static int puttmps(signed char *s, int l - - static char l[MAXLINE]; - --static int getline(char *s) -+static int xgetline(char *s) - { - static int ec; - diff --git a/xa-2.3.5-make.patch b/xa-2.4.0-make.patch similarity index 50% rename from xa-2.3.5-make.patch rename to xa-2.4.0-make.patch index 692394b..4f1ed8b 100644 --- a/xa-2.3.5-make.patch +++ b/xa-2.4.0-make.patch @@ -1,7 +1,7 @@ -diff -Nup xa-2.3.5.orig/Makefile xa-2.3.5/Makefile ---- xa-2.3.5.orig/Makefile 2009-02-08 07:49:30.000000000 +0100 -+++ xa-2.3.5/Makefile 2009-04-02 11:18:47.000000000 +0200 -@@ -15,11 +15,12 @@ LDFLAGS = -lc +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,25 +18,8 @@ diff -Nup xa-2.3.5.orig/Makefile xa-2.3.5/Makefile MKDIR = mkdir -p INSTALL = install -@@ -27,13 +28,13 @@ INSTALL = install - all: xa uncpk - - xa: -- (cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE}) -+ (cd src && LD=${LD} CC="${CC}" CFLAGS="${CFLAGS}" ${MAKE}) - - load: -- (cd loader && CC="${CC} ${CFLAGS}" ${MAKE}) -+ (cd loader && CC="${CC}" CFLAGS="${CFLAGS}" ${MAKE}) - - uncpk: -- (cd misc && CC="${CC} ${CFLAGS}" ${MAKE}) -+ (cd misc && CC="${CC}" CFLAGS="${CFLAGS}" ${MAKE}) - - dos: clean - (cd src && LD=gcc-go32 CC=gcc-go32 CFLAGS="-W -Wall -pedantic" ${MAKE}) -@@ -53,8 +54,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 c759efc..0b09c58 100644 --- a/xa.spec +++ b/xa.spec @@ -1,17 +1,17 @@ Name: xa -Version: 2.3.5 -Release: 3%{?dist} +Version: 2.4.1 +Release: 6%{?dist} Summary: 6502/65816 cross-assembler -Group: Development/Tools -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 -# fix conflict with recent glibc, reported in private email -Patch0: %{name}-2.3.5-getline.patch # update the build system, reported in private email -Patch1: %{name}-2.3.5-make.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: %{name}-2.4.0-make.patch +BuildRequires: make +BuildRequires: gcc +# Perl needed for test-suite +BuildRequires: perl-generators %description @@ -32,9 +32,7 @@ Key amongst its features: %prep -%setup -q -%patch0 -p1 -b .getline -%patch1 -p1 -b .make +%autosetup -p1 # fix encoding for f in ChangeLog @@ -46,26 +44,158 @@ done %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +%make_build CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" + + +%check +make test %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} INSTALL="install -p" - - -%clean -rm -rf $RPM_BUILD_ROOT +%make_install PREFIX=%{_prefix} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" %files -%defattr(-,root,root,-) -%doc COPYING ChangeLog README.1st doc/xa.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 + +* Sun Feb 03 2019 Fedora Release Engineering - 2.3.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.3.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Oct 11 2017 Dan Horák - 2.3.8-1 +- updated to version 2.3.8 + +* Thu Aug 03 2017 Fedora Release Engineering - 2.3.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.3.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.3.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 2.3.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 2.3.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jan 03 2015 Dan Horák - 2.3.7-1 +- updated to version 2.3.7 +- enable test-suite + +* Mon Nov 17 2014 Dan Horák - 2.3.6-1 +- updated to version 2.3.6 + +* Mon Aug 18 2014 Fedora Release Engineering - 2.3.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2.3.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Apr 20 2014 Dan Horák - 2.3.5-10 +- spec cleanup + +* Sun Aug 04 2013 Fedora Release Engineering - 2.3.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 2.3.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 2.3.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 2.3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 2.3.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jul 27 2009 Fedora Release Engineering - 2.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Apr 14 2009 Dan Horák - 2.3.5-3 - move the INSTALL override to "make install" - comment the patches