rpms/z88dk/F-7 z88dk-1.8-makefile-fixes.patch, NONE, 1.1 z88dk-1.8-makefile-usr-share.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 z88dk.spec, 1.7, 1.8 z88dk-1.7-makefile-fixes.patch, 1.1, NONE z88make.patch, 1.1, NONE

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Tue Mar 11 02:22:37 UTC 2008


Author: kkofler

Update of /cvs/pkgs/rpms/z88dk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25988/F-7

Modified Files:
	.cvsignore sources z88dk.spec 
Added Files:
	z88dk-1.8-makefile-fixes.patch 
	z88dk-1.8-makefile-usr-share.patch 
Removed Files:
	z88dk-1.7-makefile-fixes.patch z88make.patch 
Log Message:
Sync from devel:

* Mon Mar 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.8-1
- update to 1.8
- update makefile-fixes patch (most issues fixed upstream, only one left)
- update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch
- remove redundant sed (already covered by above patch)
- use DESTDIR instead of makeinstall macro (fixes buildroot in .cfg files)

z88dk-1.8-makefile-fixes.patch:

--- NEW FILE z88dk-1.8-makefile-fixes.patch ---
diff -ur z88dk/libsrc/time/Makefile z88dk-makefile-fixes/libsrc/time/Makefile
--- z88dk/libsrc/time/Makefile	2006-06-18 19:59:40.000000000 +0200
+++ z88dk-makefile-fixes/libsrc/time/Makefile	2007-12-06 08:52:10.000000000 +0100
@@ -11,6 +11,8 @@
 
 lzx: spectrum_time
 
+lnewbrain: time newbrain_time
+
 time: gmtime.o localtime.o mktime.o
 
 .c.o:
@@ -25,6 +27,9 @@
 spectrum_time:
 	cd spectrum ; $(MAKE) ; cd ..
 
+newbrain_time:
+	cd newbrain ; $(MAKE) ; cd ..
+
 clean:
 	$(RM) *.o* *.i *.sym *.map zcc_opt.def
 	$(RM) zx81/*.o*

z88dk-1.8-makefile-usr-share.patch:

--- NEW FILE z88dk-1.8-makefile-usr-share.patch ---
diff -ur z88dk/Makefile z88dk-makefile-usr-share/Makefile
--- z88dk/Makefile	2008-03-01 16:06:51.000000000 +0100
+++ z88dk-makefile-usr-share/Makefile	2008-03-11 01:27:29.000000000 +0100
@@ -7,7 +7,7 @@
 
 # ---> Configurable parameters are below his point
 
-prefix = /usr/local
+prefix = /usr
 prefix_share = $(prefix)/share
 
 # The default machine, the lib/config/DEFAULT.cfg file is copied to zcc.cfg
@@ -51,7 +51,7 @@
 
 
 setup:
-	echo '#define PREFIX "${prefix}$"/lib/z88dk"' > src/config.h
+	echo '#define PREFIX "'$(prefix_share)'/z88dk"' > src/config.h
 	echo '#define UNIX 1' >> src/config.h
 
 appmake:
@@ -87,9 +87,9 @@
 	cd libsrc ; $(MAKE) install
 
 install-libs:
-	mkdir -p $(prefix)/lib/z88dk/lib/clibs
-	cp -R lib/clibs/* $(prefix)/lib/z88dk/lib/clibs/
-	find $(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644
+	mkdir -p $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs
+	cp -R lib/clibs/* $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs/
+	find $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs -type f | xargs chmod 644
 
 
 install:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Dec 2007 08:24:42 -0000	1.3
+++ .cvsignore	11 Mar 2008 02:21:47 -0000	1.4
@@ -1 +1 @@
-z88dk-src-1.7.tgz
+z88dk-src-1.8.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Dec 2007 08:24:42 -0000	1.3
+++ sources	11 Mar 2008 02:21:47 -0000	1.4
@@ -1 +1 @@
-cbb910bcb8beb0b15b101a4420d3fb25  z88dk-src-1.7.tgz
+f3a762cb6263430f76163e3e85fa1102  z88dk-src-1.8.tgz


Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/F-7/z88dk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- z88dk.spec	7 Dec 2007 14:48:46 -0000	1.7
+++ z88dk.spec	11 Mar 2008 02:21:47 -0000	1.8
@@ -1,12 +1,12 @@
 Summary: A Z80 cross compiler
 Name: z88dk
-Version: 1.7
-Release: 2%{?dist}
+Version: 1.8
+Release: 1%{?dist}
 License: Artistic clarified
 Group: Development/Tools
 Source: http://downloads.sourceforge.net/z88dk/z88dk-src-%{version}.tgz
-Patch0: z88make.patch
-Patch1: z88dk-1.7-makefile-fixes.patch
+Patch0: z88dk-1.8-makefile-usr-share.patch
+Patch1: z88dk-1.8-makefile-fixes.patch
 Patch2: z88dk-1.7-64bit.patch
 URL: http://z88dk.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +18,9 @@
 
 %prep
 %setup -q -n z88dk
-%patch0 -p0
+# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk
+# Also support DESTDIR in install-libs
+%patch0 -p1
 # Lots of buggy makefiles there
 %patch1 -p1
 # 64-bit fixes
@@ -27,9 +29,6 @@
 # Separate manpages from other docs and fix their permissions
 %{__mv} doc/netman .
 %{__chmod} 644 netman/man3z/*
-# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk
-%{__sed} -i -e 's@[$][(]prefix[)]/lib/z88dk@$(datadir)/z88dk at g' \
-	    -e 's@[$][{]prefix[}][$]/lib/z88dk@%{_datadir}/z88dk at g' Makefile
 # Fix files with wrong line endings and bad permissions
 /usr/bin/find doc examples src -type f -exec %{__sed} -i -e 's/\r*$//' {} \;
 /usr/bin/find doc examples src -type f -exec %{__chmod} 644 {} \;
@@ -53,7 +52,7 @@
 export ZCCCFG=%{_datadir}/z88dk-%{version}/lib/config/
 %{__rm} -rf %{buildroot}
 %{__mkdir} %{buildroot}
-%{makeinstall} install-libs
+%{__make} install install-libs DESTDIR=%{buildroot}
 %{__mkdir_p} %{buildroot}%{_mandir}/man3z
 %{__cp} -p netman/man3z/* %{buildroot}%{_mandir}/man3z
 
@@ -78,6 +77,16 @@
 %{_mandir}/man3z/
 
 %changelog
+* Mon Mar 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.8-1
+- update to 1.8
+- update makefile-fixes patch (most issues fixed upstream, only one left)
+- update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch
+- remove redundant sed (already covered by above patch)
+- use DESTDIR instead of makeinstall macro (fixes buildroot in .cfg files)
+
+* Sat Feb 9 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.7-3
+- rebuild for GCC 4.3
+
 * Fri Dec 7 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.7-2
 - patch for 64-bit issues (#185511)
 - drop ExcludeArch for 64-bit architectures (#185511)


--- z88dk-1.7-makefile-fixes.patch DELETED ---


--- z88make.patch DELETED ---




More information about the fedora-extras-commits mailing list