- ac250 patch (stupid new ac doesn't like comments in the same line as #undef)

[packages/cdrtools.git] / cdrtools.spec

diff --git a/cdrtools.spec b/cdrtools.spec
index bce4db93487f2dd18f50f9efda473353a2fdabcf..31c3ca45e9280dabe24a1ba52ec0b4168d1e0333 100644 (file)
--- a/cdrtools.spec
+++ b/cdrtools.spec
@@ -1,16 +1,20 @@
-%define        ver     1.10
 Summary:       A command line CD/DVD-Recorder
 Summary(pl):   Program do nagrywania p³yt CD/DVD
 Name:          cdrtools
-Version:       %{ver}a11
-Release:       1
+Version:       1.10
+Release:       3
+Epoch:         2
 License:       GPL
 Group:         Applications/System
 Group(de):     Applikationen/System
 Group(pl):     Aplikacje/System
-Source0:       ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/%{name}-%{version}.tar.gz
-Patch0:                cdrecord-config.patch
+Source0:       ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/%{name}-%{version}.tar.gz
+Source1:       ftp://ftp.kernel.org/pub/linux/kernel/people/hpa/zisofs/zisofs-tools-0.06.tar.gz
+Patch0:                %{name}-config.patch
+Patch1:                %{name}-smmap.patch
+Patch2:                %{name}-ac250.patch
 URL:           http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
+BuildRequires: autoconf
 Obsoletes:     cdrecord
 Provides:      cdrecord
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -112,11 +116,18 @@ To jest pakiet mkisofs. Jest on u
 plików ISO9660 potrzebnych do tworzenia p³yt CD-ROM.
 
 %prep
-%setup -q -n %{name}-%{ver}
+%setup -q -a1 -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+patch -p1 < zisofs-tools-0.06/cdrtools-1.10-zisofs.diff
 
 %build
-CFLAGS="%{?debug:-O -g}%{!?debug:$RPM_OPT_FLAGS}" LDFLAGS="%{!?debug:-s}" ./Gmake.linux
+(cd conf; autoconf)
+CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" ./Gmake.linux
+
+cd zisofs-tools-0.06
+%{__make} CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -138,14 +149,17 @@ echo "man8/isoinfo.so" >  $RPM_BUILD_ROOT%{_mandir}/man8/devdump.8
 echo "man8/isoinfo.so" >        $RPM_BUILD_ROOT%{_mandir}/man8/isovfy.8
 echo "man8/isoinfo.so" >        $RPM_BUILD_ROOT%{_mandir}/man8/isodump.8
 
-gzip -9nf AN-%{version} doc/cdrecord.ps Changelog README \
-       README.ATAPI README.WORM README.audio README.cdplus \
-       README.cdrw README.linux README.mkisofs README.multi \
-       README.sony README.verify README.copy Linux.scsi-patch \
+install zisofs-tools-0.06/mkzftree $RPM_BUILD_ROOT%{_bindir}
+cp -f zisofs-tools-0.06/README README.zisofs
+
+gzip -9nf AN-%{version} doc/cdrecord.ps Changelog README README.ATAPI \
+       README.WORM README.audio README.cdplus README.cdrw README.linux \
+       README.mkisofs README.multi README.sony README.verify README.copy \
        cdda2wav/Frontends cdda2wav/HOWTOUSE cdda2wav/OtherProgs \
        cdda2wav/README cdda2wav/THANKS cdda2wav/TODO cdda2wav/cdda2mp3 \
        cdda2wav/cdda2mp3.new cdda2wav/cdda_links cdda2wav/pitchplay \
-       cdda2wav/readmult cdda2wav/tracknames.pl cdda2wav/tracknames.txt
+       cdda2wav/readmult cdda2wav/tracknames.pl cdda2wav/tracknames.txt \
+       README.zisofs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -155,7 +169,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc {AN-%{version},doc/cdrecord.ps,Changelog,README}.gz
 %doc {README.ATAPI,README.WORM,README.audio,README.cdplus}.gz
 %doc {README.cdrw,README.linux,README.mkisofs,README.multi}.gz
-%doc {README.sony,README.verify,README.copy,Linux.scsi-patch}.gz
+%doc {README.sony,README.verify,README.copy}.gz
 %doc cdrecord/cdrecord.dfl
 %config(noreplace) %{_sysconfdir}/cdrecord.conf
 %attr(755,root,root) %{_bindir}/cdrecord
@@ -197,7 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files mkisofs
 %defattr(644,root,root,755)
+%doc README.zisofs*
 %{_mandir}/man8/mkisofs.8*
 %{_mandir}/man8/mkhybrid.8*
 %attr(755,root,root) %{_bindir}/mkisofs
 %attr(755,root,root) %{_bindir}/mkhybrid
+%attr(755,root,root) %{_bindir}/mkzftree