commit 49bb9207de47099bc97b1a43ca8a8da25744995b
Author: Jakub Bogusz <[email protected]>
Date: Sun Sep 10 10:43:00 2023 +0200
- updated to 0.5.7
zxcc-DESTDIR.patch | 15 ---------------
zxcc.spec | 31 +++++++++++++++++++++----------
2 files changed, 21 insertions(+), 25 deletions(-)
---
diff --git a/zxcc.spec b/zxcc.spec
index fd78143..09282a9 100644
--- a/zxcc.spec
+++ b/zxcc.spec
@@ -1,20 +1,21 @@
Summary: Wrapper for the Hi-Tech C CP/M compiler
Summary(pl.UTF-8): Wrapper dla kompilatora Hi-Tech C pod CP/M
Name: zxcc
-Version: 0.5.6
+Version: 0.5.7
Release: 1
-License: GPL
+License: GPL v2+
Group: Development/Tools
Source0: http://www.seasip.info/Unix/Zxcc/%{name}-%{version}.tar.gz
-# Source0-md5: 194071d6c47c8582b497b6bd667c1c82
+# Source0-md5: b20977f2c5e90ae67dbfe825223f5244
Patch0: %{name}-system-libs.patch
-Patch1: %{name}-DESTDIR.patch
-URL: http://www.seasip.demon.co.uk/Unix/Zxcc/
+URL: http://www.seasip.info/Unix/Zxcc/
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: cpmio-devel
-BuildRequires: cpmredir-devel
+BuildRequires: cpmio-devel >= 1.1.1
+BuildRequires: cpmredir-devel >= 1.1.1
BuildRequires: libtool
+Requires: cpmio >= 1.1.1
+Requires: cpmredir >= 1.1.1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -31,7 +32,6 @@ CP/M 3 (MAC, RMAC, LINK, GENCOM).
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
@@ -50,11 +50,22 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# packaged in HTML version as %doc
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/zxcc/zxcc.doc
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc ChangeLog zxcc.html
-%attr(755,root,root) %{_bindir}/*
-%{_libdir}/cpm
+%attr(755,root,root) %{_bindir}/zxas
+%attr(755,root,root) %{_bindir}/zxc
+%attr(755,root,root) %{_bindir}/zxcc
+%attr(755,root,root) %{_bindir}/zxlibr
+%attr(755,root,root) %{_bindir}/zxlink
+%dir %{_libdir}/cpm
+%dir %{_libdir}/cpm/bin80
+%{_libdir}/cpm/bin80/bios.bin
+%dir %{_libdir}/cpm/lib80
+%dir %{_libdir}/cpm/include80
diff --git a/zxcc-DESTDIR.patch b/zxcc-DESTDIR.patch
deleted file mode 100644
index ccde541..0000000
--- a/zxcc-DESTDIR.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- zxcc-0.5.3/Z80/Makefile.am.orig 2001-08-26 00:46:05.000000000 +0200
-+++ zxcc-0.5.3/Z80/Makefile.am 2003-08-23 09:43:00.359719608 +0200
-@@ -7,8 +7,8 @@
- z80asm -fb -l bios.zsm
-
- install-data-local:
-- $(mkinstalldirs) $(libdir)/cpm/bin80
-- $(mkinstalldirs) $(libdir)/cpm/lib80
-- $(mkinstalldirs) $(libdir)/cpm/include80
-- $(INSTALL_DATA) $(srcdir)/bios.bin $(libdir)/cpm/bin80/bios.bin
-+ $(mkinstalldirs) $(DESTDIR)$(libdir)/cpm/bin80
-+ $(mkinstalldirs) $(DESTDIR)$(libdir)/cpm/lib80
-+ $(mkinstalldirs) $(DESTDIR)$(libdir)/cpm/include80
-+ $(INSTALL_DATA) $(srcdir)/bios.bin
$(DESTDIR)$(libdir)/cpm/bin80/bios.bin
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zxcc.git/commitdiff/49bb9207de47099bc97b1a43ca8a8da25744995b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
