rpms/z88dk/devel z88dk.spec, NONE, 1.1 z88make.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Fri Jan 13 00:19:34 UTC 2006
Author: pfj
Update of /cvs/extras/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7109/devel
Modified Files:
.cvsignore sources
Added Files:
z88dk.spec z88make.patch
Log Message:
auto-import z88dk-1.6-7 on branch devel from z88dk-1.6-7.src.rpm
--- NEW FILE z88dk.spec ---
Summary: A Z80 cross compiler
Name: z88dk
Version: 1.6
Release: 7%{?dist}
License: Artistic
Group: Development/Tools
Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
Patch: z88make.patch
URL: http://z88dk.sourceforge.net/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
z88dk is a Z80 cross compiler capable of generating binary files for a variety
of Z80 based machines (such as the ZX81, Spectrum and Jupiter Ace).
%prep
%setup -q -n z88dk
%patch0 -p0 -b Makefile
/usr/bin/find . -depth -name CVS -type d -exec %{__rm} -rf {} \;
%{__mkdir} bin
# 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 {} \;
%build
export Z80_OZFILES=%{_builddir}/z88dk/lib/
export ZCCCFG=%{_builddir}/z88dk/lib/config/
export PATH=%{_builddir}/z88dk/bin:$PATH
export CC=gcc
export CFLAGS="%{optflags}"
ExcludeArch=x86_64
# Note: do not use %{?_smp_mflags} with make because the Makefiles don't support parallel builds
%{__make} clean
%{__make} -e
%{__make} -e libs
%install
export Z80_OZFILES=%{_datadir}/z88dk-%{version}/lib/
export ZCCCFG=%{_datadir}/z88dk-%{version}/lib/config/
%{__rm} -rf %{buildroot}
%{makeinstall} install-libs
%{__mkdir_p} %{buildroot}%{_mandir}/man3z
%{__cp} -p netman/man3z/* %{buildroot}%{_mandir}/man3z
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,0755)
%doc doc/*.html doc/*.gif doc/copt.man
%doc doc/compile.txt doc/cpc.txt doc/embedded.txt doc/error.txt doc/farmods.txt
%doc doc/fileio.txt doc/lib3d.txt doc/options.txt doc/packages.txt
%doc doc/platforms.txt doc/retarget.txt doc/stdio.txt doc/ti.txt doc/z80asm.txt
%doc doc/zxscrdrv.txt
%doc EXTENSIONS LICENSE www
# Examples might be worth putting in subpackage
%doc examples
%{_bindir}/appmake
%{_bindir}/copt
%{_bindir}/sccz80
%{_bindir}/z80asm
%{_bindir}/zcc
%{_bindir}/zcpp
%{_datadir}/z88dk/
%{_mandir}/man3z/
%changelog
* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.6-7
- Add ExcludeArch for x86_64 machines
* Mon Oct 17 2005 Paul Howarth <paul at city-fan.org> - 1.6-6
- Use full URL for upstream tarball location
- Don't use macros in build-time command paths (see #170506 for discussion)
- Tarball expands to directory z88dk, not z88dk-%%{version}
* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.6-5
- Modified the spec file to fix the rpmlint problems
* Wed Sep 14 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.6-4
- Add diff for makefile and patch aspect to spec
- rebuilt
* Wed Sep 14 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.6-3
- Fixed the spec file as it was constantly looking to /var/tmp!
- Fixed the source to point to /usr/share/z88dk for configs
- Removed `pwd` as it was causing problems
* Tue Sep 13 2005 Paul Howarth <paul at city-fan.org> - 1.6-2
- Use macros consistently
- Clean out buildroot in %%install rather than %%prep
- Include additional docs
- Tidy summary and description
- Honor %%{optflags}
- Remove CVS cruft
- Separate manpages from rest of docs
- Put target libraries, include files etc. under %%{_datadir}, not /usr/lib
- No scriptlets needed
- Fix file permissions and line endings
- Remove vendor and packager tags
- Use "Artistic" in license tag
* Tue Sep 13 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk>
- Fixes to spec file
* Mon Sep 12 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk>
- initial import and rpm builds
z88make.patch:
--- NEW FILE z88make.patch ---
--- Makefile 2004-10-08 10:47:51.000000000 +0100
+++ z88dk-1.6/Makefile 2005-09-14 17:00:23.000000000 +0100
@@ -7,7 +7,7 @@
# ---> Configurable parameters are below his point
-prefix = /usr/local
+prefix = /usr
# The default machine, the lib/config/DEFAULT.cfg file is copied to zcc.cfg
DEFAULT = z88
@@ -50,7 +50,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:
@@ -86,29 +86,28 @@
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 $(prefix)/share/z88dk/lib/clibs
+ cp -R lib/clibs/* $(prefix)/share/z88dk/lib/clibs/
+ find $(prefix)/share/z88dk/lib/clibs -type f | xargs chmod 644
install:
mkdir -p -m 755 $(prefix)/bin $(prefix)/lib
- mkdir -p -m 755 $(prefix)/lib/z88dk $(prefix)/lib/z88dk/lib
- mkdir -p -m 755 $(prefix)/lib/z88dk/lib/clibs $(prefix)/lib/z88dk/lib/config
+ mkdir -p -m 755 $(prefix)/share/z88dk $(prefix)/share/z88dk/lib
+ mkdir -p -m 755 $(prefix)/share/z88dk/lib/clibs $(prefix)/share/z88dk/lib/config
cd src/appmake ; $(MAKE) PREFIX=$(prefix) install
cd src/copt ; $(MAKE) PREFIX=$(prefix) install
cd src/cpp ; $(MAKE) PREFIX=$(prefix) install
cd src/sccz80 ; $(MAKE) PREFIX=$(prefix) install
cd src/z80asm ; $(MAKE) PREFIX=$(prefix) install
cd src/zcc ; $(MAKE) PREFIX=$(prefix) install
- ./config.sh $(prefix)/lib/z88dk/ $(DEFAULT)
- cp -R -p include $(prefix)/lib/z88dk
- cp -R -p lib $(prefix)/lib/z88dk
- find $(prefix)/lib/z88dk/include -name '*.h' | xargs chmod 644
- find $(prefix)/lib/z88dk/include -type d | xargs chmod 755
- find $(prefix)/lib/z88dk/lib -type f | xargs chmod 644
- find $(prefix)/lib/z88dk/lib -type d | xargs chmod 755
-
+ ./config.sh /usr/share/z88dk/ $(DEFAULT)
+ cp -R -p include $(prefix)/share/z88dk
+ cp -R -p lib $(prefix)/share/z88dk
+ find $(prefix)/share/z88dk/lib -type f | xargs chmod 644
+ find $(prefix)/share/z88dk/lib -type d | xargs chmod 755
+ find $(prefix)/share/z88dk/include -name '*.h' | xargs chmod 644
+ find $(prefix)/share/z88dk/include -type d | xargs chmod 755
clean: clean-bins
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/z88dk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Jan 2006 00:16:02 -0000 1.1
+++ .cvsignore 13 Jan 2006 00:19:34 -0000 1.2
@@ -0,0 +1 @@
+z88dk-src-1.6.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/z88dk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Jan 2006 00:16:02 -0000 1.1
+++ sources 13 Jan 2006 00:19:34 -0000 1.2
@@ -0,0 +1 @@
+5fd75dea26da3c3d863b9e15f6524af9 z88dk-src-1.6.tgz
More information about the fedora-extras-commits
mailing list