X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cdrtools.spec;h=fba15e984db39d874fb69e5802515e86fa63e0af;hb=53e470c3b460a37cafd7ab7a0600d0199219b33f;hp=986e5883f8b8a0980d9cdce6e001df8187f7de0e;hpb=093d24273bd06d19f931a9873830d6e4692a0bb7;p=packages%2Fcdrtools.git

diff --git a/cdrtools.spec b/cdrtools.spec
index 986e588..fba15e9 100644
--- a/cdrtools.spec
+++ b/cdrtools.spec
@@ -1,27 +1,27 @@
 Summary:	A command line CD/DVD-Recorder
-Summary(pt_BR):	Um programa de gravação de CD/DVD.
-Summary(es):	Un programa de grabación de CD/DVD.
+Summary(es):	Un programa de grabación de CD/DVD
 Summary(pl):	Program do nagrywania p³yt CD/DVD
-Summary(pt_BR):	Um programa de gravação de CD/DVD.
+Summary(pt_BR):	Um programa de gravação de CD/DVD
 Summary(ru):	ðÒÏÇÒÁÍÍÁ ÄÌÑ ÚÁÐÉÓÉ CD/DVD, ÚÁÐÕÓËÁÅÍÁÑ ÉÚ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ
 Summary(uk):	ðÒÏÇÒÁÍÁ ÄÌÑ ÚÁÐÉÓÕ CD/DVD, ÑËÁ ÚÁÐÕÓËÁ¤ÔØÓÑ Ú ËÏÍÁÎÄÎϧ ÓÔÒ¦ÞËÉ
 Name:		cdrtools
-Version:	2.01a14
+Version:	2.01a33
 Release:	1
 Epoch:		3
 License:	GPL v2
 Group:		Applications/System
 Source0:	ftp://ftp.berlios.de/pub/cdrecord/alpha/%{name}-%{version}.tar.bz2
+# Source0-md5:	8248e2e84327f3d19104313c71d8d873
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-smmap.patch
-Patch2:		%{name}-silo.patch
-Patch3:		%{name}-man.patch
-Patch4:		%{name}-u8-type.aptch
+Patch2:		%{name}-man.patch
+Patch3:		%{name}-no-kernel-headers.patch
+Patch4:		%{name}-min_gracetime.patch
 URL:		http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
 BuildRequires:	autoconf
 BuildRequires:	automake
-Obsoletes:	cdrecord
 Provides:	cdrecord
+Obsoletes:	cdrecord
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -91,10 +91,10 @@ SCSI-
 
 %package cdda2wav
 Summary:	Get WAV files from digital audio cd's
-Summary(es):	Crea archivos tipo WAV a partir de CDs de audio.
+Summary(es):	Crea archivos tipo WAV a partir de CDs de audio
 Summary(fr):	convertisseur CD-Audio->.wav
 Summary(pl):	Uzyskaj pliki WAV z cyfrowego kompaktu audio
-Summary(pt_BR):	Cria arquivos tipo WAV a partir de CDs de áudio.
+Summary(pt_BR):	Cria arquivos tipo WAV a partir de CDs de áudio
 Summary(ru):	õÔÉÌÉÔÁ ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÆÁÊÌÏ× .wav Ó digital audio CD
 Summary(uk):	õÔÉ̦ÔÁ ÄÌÑ ÇÅÎÅÒÁæ§ ÆÁÊÌ¦× .wav Ú digital audio CD
 Group:		Applications/Sound
@@ -148,10 +148,10 @@ Group:		Applications/System
 Obsoletes:	cdrecord-readcd
 
 %description readcd
-Read/Write data Compact Discs
+Read/Write data Compact Discs.
 
 %description readcd -l pl
-Odczytuje/Zapisuje dane z P³yt Kompaktowych
+Odczytuje/Zapisuje dane z P³yt Kompaktowych.
 
 %package utils
 Summary:	Dumping and verifying iso9660 images
@@ -217,21 +217,28 @@ fazer CD-ROMs de boot "El Torito".
 chmod +w -R *
 %patch0 -p1
 %patch1 -p1
-%ifarch sparc sparcv9 sparc64
 %patch2 -p1
-%endif
 %patch3 -p1
 %patch4 -p1
 
+ln -sf i586-linux-gcc.rul RULES/x86_64-linux-gcc.rul
+ln -sf i586-linux-cc.rul RULES/x86_64-linux-cc.rul
+
+%{__perl} -pi -e 's/^(INSDIR=.*)lib/$1%{_lib}/' \
+	libfile/Makefile libhfs_iso/Makefile lib*/*.mk
+
 %build
 cd conf
+cp -f /usr/share/automake/config.* .
 cp xconfig.h.in xconfig.h.in.org
 sed -e 's#/\*.*\*/##g' xconfig.h.in.org > xconfig.h.in
 rm -f acgeneral.m4 acspecific.m4 autoheader.m4 acoldnames.m4 autoconf.m4
-%{__aclocal}
+# don't run aclocal, aclocal.m4 contains only local defs
 %{__autoconf}
 cd ..
-CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" ./Gmake.linux
+CFLAGS="%{rpmcflags}" \
+LDFLAGS="%{rpmldflags}" \
+./Gmake.linux
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -254,9 +261,10 @@ install libscg/scg/*		$RPM_BUILD_ROOT%{_includedir}/schily/scg
 install cdrecord/cdrecord.dfl	$RPM_BUILD_ROOT%{_sysconfdir}/cdrecord.conf
 
 # fix manual pages
-echo ".so man8/isoinfo.8" >	$RPM_BUILD_ROOT%{_mandir}/man8/devdump.8
-echo ".so man8/isoinfo.8" >     $RPM_BUILD_ROOT%{_mandir}/man8/isovfy.8
-echo ".so man8/isoinfo.8" >     $RPM_BUILD_ROOT%{_mandir}/man8/isodump.8
+echo '.so isoinfo.8' > $RPM_BUILD_ROOT%{_mandir}/man8/devdump.8
+echo '.so isoinfo.8' > $RPM_BUILD_ROOT%{_mandir}/man8/isovfy.8
+echo '.so isoinfo.8' > $RPM_BUILD_ROOT%{_mandir}/man8/isodump.8
+echo '.so cdda2ogg.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cdda2mp3.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -264,9 +272,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AN-* doc/cdrecord.ps Changelog README README.ATAPI README.DiskT@2
-%doc README.WORM README.audio README.cdplus README.cdtext README.cdrw
-%doc README.copy README.linux README.mkisofs README.multi README.parallel
-%doc README.raw README.rscsi README.sony README.verify make_diskt@2.sh
+%doc README.{WORM,audio,cdplus,cdtext,cdrw,clone,copy,linux,mkisofs,multi}
+%doc README.{parallel,raw,rscsi,sony,verify} make_diskt@2.sh
 %doc cdrecord/cdrecord.dfl cdrecord/LICENSE
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/cdrecord.conf
 %attr(755,root,root) %{_bindir}/cdrecord
@@ -280,8 +287,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 %{_includedir}/schily
 %{_includedir}/*.h
-#%attr(755,root,root) %{_bindir}/scgcheck
-#%%{_mandir}/man1/scgcheck.1*
 
 %files cdda2wav
 %defattr(644,root,root,755)
@@ -294,33 +299,34 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/cdda2mp3
 %attr(755,root,root) %{_bindir}/cdda2ogg
 %{_mandir}/man1/cdda2wav.1*
+%{_mandir}/man1/cdda2mp3.1*
 %{_mandir}/man1/cdda2ogg.1*
 
 %files readcd
 %defattr(644,root,root,755)
-%{_mandir}/man1/readcd.1*
 %attr(755,root,root) %{_bindir}/readcd
+%{_mandir}/man1/readcd.1*
 
 %files utils
 %defattr(644,root,root,755)
-%{_mandir}/man8/isoinfo.8*
-%{_mandir}/man8/devdump.8*
-%{_mandir}/man8/isovfy.8*
-%{_mandir}/man8/isodump.8*
 %attr(755,root,root) %{_bindir}/devdump
 %attr(755,root,root) %{_bindir}/isodebug
 %attr(755,root,root) %{_bindir}/isoinfo
 %attr(755,root,root) %{_bindir}/isovfy
 %attr(755,root,root) %{_bindir}/isodump
+%{_mandir}/man8/isoinfo.8*
+%{_mandir}/man8/devdump.8*
+%{_mandir}/man8/isovfy.8*
+%{_mandir}/man8/isodump.8*
 
 %files mkisofs
 %defattr(644,root,root,755)
-%{_mandir}/man8/mkisofs.8*
-%{_mandir}/man8/mkhybrid.8*
-%attr(755,root,root) %{_bindir}/mkisofs
-%attr(755,root,root) %{_bindir}/mkhybrid
 %doc mkisofs/README.compression mkisofs/README.eltorito mkisofs/README
 %doc mkisofs/README.graft_dirs mkisofs/README.hfs_boot mkisofs/README.hfs_magic
 %doc mkisofs/README.hide mkisofs/README.joliet mkisofs/README.mkhybrid
 %doc mkisofs/README.prep_boot mkisofs/README.rootinfo mkisofs/README.session
 %doc mkisofs/README.sort mkisofs/README.sparcboot
+%attr(755,root,root) %{_bindir}/mkisofs
+%attr(755,root,root) %{_bindir}/mkhybrid
+%{_mandir}/man8/mkisofs.8*
+%{_mandir}/man8/mkhybrid.8*