packages: cdrtools/cdrtools.spec - fixed x86_64 arch - thanks to arekm

amateja amateja at pld-linux.org
Fri Jan 8 10:10:20 CET 2010


Author: amateja                      Date: Fri Jan  8 09:10:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed x86_64 arch
- thanks to arekm

---- Files affected:
packages/cdrtools:
   cdrtools.spec (1.149 -> 1.150) 

---- Diffs:

================================================================
Index: packages/cdrtools/cdrtools.spec
diff -u packages/cdrtools/cdrtools.spec:1.149 packages/cdrtools/cdrtools.spec:1.150
--- packages/cdrtools/cdrtools.spec:1.149	Thu Jan  7 22:55:40 2010
+++ packages/cdrtools/cdrtools.spec	Fri Jan  8 10:10:14 2010
@@ -243,19 +243,19 @@
 rm -f $(find . -name '*_p.mk')
 
 cp -f /usr/share/automake/config.* ./conf
-ln -sf i586-linux-gcc.rul RULES/x86_64-linux-gcc.rul
-ln -sf i586-linux-cc.rul RULES/x86_64-linux-cc.rul
+#ln -sf i586-linux-gcc.rul RULES/x86_64-linux-gcc.rul
+#ln -sf i586-linux-cc.rul RULES/x86_64-linux-cc.rul
 
 # kill annoying beep and sleep
-%{__sed} -i -e 's/^__gmake_warn.*//' RULES/mk-gmake.id
+%{__sed} -i -e 's/^__gmake_warn.*//g' RULES/mk-gmake.id
 
 %{__sed} -i -e "s/-o \$(INSUSR) -g \$(INSGRP)//g" RULES/rules.prg
 %{__sed} -i -e 's#/\*.*\*/##g' autoconf/xconfig.h.in
 
-%{__sed} -i -e 's/^(INSDIR=.*)lib/$1%{_lib}/' \
-	libfile/Makefile libhfs_iso/Makefile lib*/*.mk
+%{__sed} -i -e 's/^\(INSDIR=.*\)lib$/\1%{_lib}/g' lib*/*.mk
 %{__sed} -i -e 's/lib\/siconv/%{_lib}\/siconv/g' \
-	libsiconv/{Makefile,sic_nls.c} libsiconv/*/*.mk
+	libsiconv/{sic_nls.c,*/*.mk} mkisofs/{diag/isoinfo.c,mkisofs.c}
+
 %{__sed} -i -e 's#/usr/bin/gm4#%{_bindir}/m4#g' autoconf/autoconf
 
 cd ./autoconf
@@ -387,6 +387,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.150  2010/01/08 09:10:14  amateja
+- fixed x86_64 arch
+- thanks to arekm
+
 Revision 1.149  2010/01/07 21:55:40  amateja
 - single threaded make install
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cdrtools/cdrtools.spec?r1=1.149&r2=1.150&f=u



More information about the pld-cvs-commit mailing list