dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 15:30:50 +00:00 · 2009-11-26 01:28:46 +00:00 · 2009-04-15 07:45:44 +00:00 · 2009-04-14 16:09:13 +00:00
5 changed files with 74 additions and 157 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/xa-*.tar.gz
+xa-2.3.5.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xa-2.4.1.tar.gz) = aaec796bec362ab253abc33320cb36ef879fa661c2091c7e3b2ce96ccc56063c59335fb7eb1d6a3de9486ab8973cbbc71c445e1ef816572a55a1338ffed19dc0
+edd15aa8674fb86225faf34e56d5cab2  xa-2.3.5.tar.gz
--- a/xa-2.3.5-getline.patch
+++ b/xa-2.3.5-getline.patch
@ -0,0 +1,30 @@
+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;
+ 
--- a/xa-2.3.5-make.patch
+++ b/xa-2.3.5-make.patch
@ -1,7 +1,7 @@
-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
+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
 #CFLAGS =
 #LD = ld
 
@ -18,8 +18,25 @@ diff -up xa-2.4.0/Makefile.orig xa-2.4.0/Makefile
 
 MKDIR = mkdir -p
 INSTALL = install
-@@ -63,8 +63,8 @@ clean:
- install: all
+@@ -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
 	$(MKDIR) $(BINDIR)
 	$(MKDIR) $(MANDIR)
 -	$(INSTALL) xa reloc65 ldo65 file65 printcbm uncpk $(BINDIR)
--- a/xa.spec
+++ b/xa.spec
@ -1,17 +1,17 @@
 Name:           xa
-Version:        2.4.1
-Release:        6%{?dist}
+Version:        2.3.5
+Release:        3%{?dist}
 Summary:        6502/65816 cross-assembler

-License:        GPL-2.0-or-later
+Group:          Development/Tools
+License:        GPLv2+
 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
-Patch0:         %{name}-2.4.0-make.patch
-BuildRequires:  make
-BuildRequires:  gcc
-# Perl needed for test-suite
-BuildRequires:  perl-generators
+Patch1:         %{name}-2.3.5-make.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


 %description
@ -32,7 +32,9 @@ Key amongst its features:


 %prep
-%autosetup -p1
+%setup -q
+%patch0 -p1 -b .getline
+%patch1 -p1 -b .make

 # fix encoding
 for f in ChangeLog
@ -44,158 +46,26 @@ done


 %build
-%make_build CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}"
-
-
-%check
-make test
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


 %install
-%make_install PREFIX=%{_prefix} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}"
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} INSTALL="install -p"
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT


 %files
-%doc COPYING ChangeLog README.1st
+%defattr(-,root,root,-)
+%doc COPYING ChangeLog README.1st doc/xa.txt
 %{_bindir}/*
 %{_mandir}/man1/*


 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Mar 06 2024 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 2.4.1-1
- Update to 2.4.1 (rhbz#2268042)
-
-* Tue Mar 05 2024 Dan Horák <dan[at]danny.cz> - 2.4.0-1
- updated to version 2.4.0
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Feb 16 2023 Dan Horák <dan[at]danny.cz> - 2.3.14-1
- updated to version 2.3.14
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sun Aug 14 2022 Dan Horák <dan[at]danny.cz> - 2.3.13-1
- updated to version 2.3.13
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.11-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.11-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2.3.11-3
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Thu May 07 2020 Dan Horák <dan[at]danny.cz> - 2.3.11-2
- rebuilt with new source archive
-
-* Tue May 05 2020 Dan Horák <dan[at]danny.cz> - 2.3.11-1
- updated to version 2.3.11
-
-* Thu Jan 30 2020 Dan Horák <dan[at]danny.cz> - 2.3.10-2
- fix build with gcc 10
-
-* Tue Jan 28 2020 Lars Kellogg-Stedman <lars@oddbit.com> - 2.3.10-1
- updated to version 2.3.10
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 09 2019 Dan Horák <dan[at]danny.cz> - 2.3.9-1
- updated to version 2.3.9
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Oct 11 2017 Dan Horák <dan[at]danny.cz> - 2.3.8-1
- updated to version 2.3.8
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Jan 03 2015 Dan Horák <dan[at]danny.cz> - 2.3.7-1
- updated to version 2.3.7
- enable test-suite
-
-* Mon Nov 17 2014 Dan Horák <dan[at]danny.cz> - 2.3.6-1
- updated to version 2.3.6
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.5-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.5-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Apr 20 2014 Dan Horák <dan[at]danny.cz> - 2.3.5-10
- spec cleanup
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Tue Apr 14 2009 Dan Horák <dan[at]danny.cz> - 2.3.5-3
 - move the INSTALL override to "make install"
 - comment the patches
Author	SHA1	Message	Date
Fedora Release Engineering	114837d5eb	dist-git conversion	2010-07-29 15:30:50 +00:00
Bill Nottingham	42fe883652	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:28:46 +00:00
Dan Horák	8dfe9c6fe2	initial import	2009-04-15 07:45:44 +00:00
Kevin Fenzi	4610ef006a	Initialize branch EL-5 for xa	2009-04-14 16:09:13 +00:00