- up to a53; still some cdda2wav rule broken

[packages/cdrtools.git] / cdrtools.spec

diff --git a/cdrtools.spec b/cdrtools.spec
index 60af0b2d52f5f85c63c49eb5a26cf9ee52ece1f4..ab56cd67e51246ce4ffbc3d797eeb94bd968f3db 100644 (file)
--- a/cdrtools.spec
+++ b/cdrtools.spec
@@ -1,4 +1,4 @@
-%define                subver  a40
+%define                subver  a53
 Summary:       A command line CD/DVD-Recorder
 Summary(es.UTF-8):     Un programa de grabación de CD/DVD
 Summary(pl.UTF-8):     Program do nagrywania płyt CD/DVD
@@ -12,9 +12,8 @@ Epoch:                5
 License:       GPL v2 (mkisofs), LGPL v2.1 (cdda2wav), CDDL v1.0 (the rest)
 Group:         Applications/System
 Source0:       ftp://ftp.berlios.de/pub/cdrecord/alpha/%{name}-%{version}%{subver}.tar.bz2
-# Source0-md5: 2cec2eae123d4021a6e1da8b502d88f8
+# Source0-md5: 9a17ad56fa96ceabddea55b15d1a4457
 Patch0:                %{name}-config.patch
-Patch1:                %{name}-smmap.patch
 Patch2:                %{name}-man.patch
 Patch3:                %{name}-make.patch
 Patch4:                %{name}-linking.patch
@@ -26,6 +25,8 @@ Provides:     cdrecord
 Obsoletes:     cdrecord
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                specflags       -finput-charset=ISO-8859-1 -fexec-charset=UTF-8 -D__attribute_const__=const
+
 %description
 Cdrecord allows you to create CD's on a CD-Recorder (SCSI/ATAPI).
 Supports data, audio, mixed, multi-session and CD+ discs etc.
@@ -230,34 +231,42 @@ BTC.
 %setup -q
 chmod +w -R *
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 
+# Remove profiled make files
+rm -f $(find . -name '*_p.mk')
+
 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
 
+%{__perl} -pi -e 's/lib\/siconv/%{_lib}\/siconv/g' \
+       libsiconv/{Makefile,sic_nls.c} libsiconv/*/*.mk
+
 # kill annoying beep and sleep
 %{__perl} -pi -e 's/^__gmake_warn.*//' RULES/mk-gmake.id
 
 sed -i -e "s/-o \$(INSUSR) -g \$(INSGRP)//g" RULES/rules.prg
 
 %build
+sed -i -e 's#/usr/bin/gm4#%{_bindir}/m4#g' autoconf/autoconf
 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
+cd ../autoconf
+sed -i -e 's#/\*.*\*/##g' xconfig.h.in
+for a in acgeneral.m4 acspecific.m4 autoheader.m4 acoldnames.m4 autoconf.m4; do
+       :> $a
+done
 # don't run aclocal, aclocal.m4 contains only local defs
 %{__autoconf}
 cd ..
 
-%{__make} \
+%{__make} -j1 \
        CC="%{__cc}" \
        LDCC="%{__cc}" \
        COPTOPT="%{rpmcflags}" \