- fixed CFLAGS/LDFLAGS passing

[packages/cdrtools.git] / cdrtools.spec

diff --git a/cdrtools.spec b/cdrtools.spec
index dd05266adfe42f13af3567ec1523e9bfd987fc72..74c3f7c769baa0c34a1c021409a1695f66d59375 100644 (file)
--- a/cdrtools.spec
+++ b/cdrtools.spec
@@ -6,8 +6,8 @@ Summary(ru):    
 Summary(uk):   ðÒÏÇÒÁÍÁ ÄÌÑ ÚÁÐÉÓÕ CD/DVD, ÑËÁ ÚÁÐÕÓËÁ¤ÔØÓÑ Ú ËÏÍÁÎÄÎϧ ÓÔÒ¦ÞËÉ
 Name:          cdrtools
 Version:       2.01
-Release:       2
-Epoch:         4
+Release:       3
+Epoch:         5
 License:       GPL v2
 Group:         Applications/System
 Source0:       ftp://ftp.berlios.de/pub/cdrecord/%{name}-%{version}.tar.bz2
@@ -17,12 +17,6 @@ Patch1:              %{name}-smmap.patch
 Patch2:                %{name}-man.patch
 Patch3:                %{name}-no-kernel-headers.patch
 Patch4:                %{name}-min_gracetime.patch
-Patch5:                %{name}-dvd-2.patch
-Patch6:                %{name}-dvd-fix.patch
-Patch7:                %{name}-nodebug.patch
-Patch8:                %{name}-scan.patch
-Patch9:                %{name}-mkisofs-iconv-10.patch
-Patch10:       %{name}-mkisofs-padsize-123548.patch
 URL:           http://cdrecord.berlios.de/old/private/cdrecord.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -219,19 +213,13 @@ fazer CD-ROMs de boot "El Torito".
 ÚÁ×ÁÎÔÁÖÕ×ÁÎÉÈ El Torito CD-ROM'¦×.
 
 %prep
-%setup -q -n cdrtools-2.01
+%setup -q
 chmod +w -R *
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p0
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -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
@@ -251,15 +239,16 @@ rm -f acgeneral.m4 acspecific.m4 autoheader.m4 acoldnames.m4 autoconf.m4
 # don't run aclocal, aclocal.m4 contains only local defs
 %{__autoconf}
 cd ..
-CFLAGS="%{rpmcflags}" \
-LDFLAGS="%{rpmldflags}" \
-./Gmake.linux
+%{__make} \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags}" \
+       LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_includedir}/schily/scg}
 
-./Gmake.linux install \
+%{__make} install \
        MANDIR=share/man \
        INS_BASE=$RPM_BUILD_ROOT%{_prefix}
 
@@ -290,7 +279,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cdrecord.conf
 %attr(755,root,root) %{_bindir}/cdrecord
 %attr(755,root,root) %{_bindir}/scgcheck
 %attr(755,root,root) %{_sbindir}/rscsi