SPECS: z88dk.spec -up to 1.7

[witekfl]

Author: witekfl                      Date: Thu Jan 31 00:03:04 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
-up to 1.7

---- Files affected:
SPECS:
   z88dk.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/z88dk.spec
diff -u SPECS/z88dk.spec:1.24 SPECS/z88dk.spec:1.25
--- SPECS/z88dk.spec:1.24	Mon Feb 12 23:09:26 2007
+++ SPECS/z88dk.spec	Thu Jan 31 01:02:58 2008
@@ -2,13 +2,13 @@
 Summary:	Z88 Development Kit
 Summary(pl.UTF-8):	Zestaw programistyczny Z88
 Name:		z88dk
-Version:	1.6
+Version:	1.7
 Release:	1
 Epoch:		1
 License:	Artistic
 Group:		Development/Tools
 Source0:	http://dl.sourceforge.net/z88dk/%{name}-src-%{version}.tgz
-# Source0-md5:	5fd75dea26da3c3d863b9e15f6524af9
+# Source0-md5:	cbb910bcb8beb0b15b101a4420d3fb25
 URL:		http://z88dk.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	sed >= 4.0
@@ -39,28 +39,22 @@
 
 %prep
 %setup -q -n %{name}
-
-find www -name CVS -exec rm -rf {} \; ||:
-
 sed -i -e 's/$(prefix)/$(DESTDIR)\/$(prefix)/g' Makefile
 sed -i -e 's/\.\/config\.sh $(DESTDIR)\//\.\/config.sh /' Makefile
 
 %build
-mkdir bin
 Z80_OZFILES=`pwd`/lib/
 ZCCCFG=`pwd`/lib/config/
 PATH=$PATH:`pwd`/bin
 CC="%{__cc}"
-CFLAGS="%{rpmcflags}"
 CCOPT=-DUNIX
-export CC CFLAGS CCOPT
+export CC CCOPT
 export PATH Z80_OZFILES ZCCCFG
-%{__make} prefix=%{_prefix}
+%{__make} CFLAGS="%{rpmcflags}" prefix=%{_prefix}
 %{__make} -C `pwd`/libsrc
 %{__make} -C `pwd`/libsrc install
 
-cp support/zx/bin2tap.c .
-%{__cc} %{rpmcflags} %{rpmldflags} bin2tap.c -o bin2tap
+%{__cc} %{rpmcflags} %{rpmldflags} support/zx/tapmaker.c -o tapmaker
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,7 +63,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT DEFAULT=zx prefix=%{_prefix}
-install bin2tap $RPM_BUILD_ROOT%{_bindir}
+install tapmaker $RPM_BUILD_ROOT%{_bindir}
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}
 
 %clean
@@ -77,7 +71,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README.1st EXTENSIONS doc/* support www LICENSE
+%doc README.1st EXTENSIONS doc/* support LICENSE
 %attr(755,root,root) %{_bindir}/*
 %{_libdir}/%{name}
 
@@ -92,7 +86,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.24  2007-02-12 22:09:26  glen
+Revision 1.25  2008-01-31 00:02:58  witekfl
+-up to 1.7
+
+Revision 1.24  2007/02/12 22:09:26  glen
 - tabs in preamble
 
 Revision 1.23  2007/02/12 01:06:41  baggins
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/z88dk.spec?r1=1.24&r2=1.25&f=u