[packages/cdparanoia-III] - rel 5; fix build; parallel build broken; cdda incdir compat added

arekm arekm at pld-linux.org
Thu Oct 10 22:08:03 CEST 2013


commit 288f38ec3625e6dd02fc4f4346c4fda46d70d1b8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Oct 10 22:07:59 2013 +0200

    - rel 5; fix build; parallel build broken; cdda incdir compat added

 cdparanoia-III-gcc43.patch | 15 +++++++++++++++
 cdparanoia-III.spec        |  8 ++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/cdparanoia-III.spec b/cdparanoia-III.spec
index 514e9cb..4c5b760 100644
--- a/cdparanoia-III.spec
+++ b/cdparanoia-III.spec
@@ -6,7 +6,7 @@ Summary(ru.UTF-8):	Утилита для копирования цифровых
 Summary(uk.UTF-8):	Утиліта для копіювання цифрових аудіо-CD
 Name:		cdparanoia-III
 Version:	10.2
-Release:	4
+Release:	5
 Epoch:		2
 License:	LGPL v2 (libraries), GPL v2 (utility)
 Group:		Applications/Sound
@@ -137,7 +137,7 @@ cp -f %{_datadir}/automake/config.sub configure.sub
 %{__aclocal}
 %{__autoconf}
 %configure
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -151,6 +151,9 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}/man1,%{_includedir}}
 
 install -D cdparanoia.1.jp $RPM_BUILD_ROOT%{_mandir}/ja/man1/cdparanoia.1
 
+# fc compat
+ln -s . $RPM_BUILD_ROOT%{_includedir}/cdda
+
 # for rpm autodeps
 chmod +x $RPM_BUILD_ROOT%{_libdir}/lib*so.*
 
@@ -178,6 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcdda_interface.so
 %attr(755,root,root) %{_libdir}/libcdda_paranoia.so
+%dir %{_includedir}/cdda
 %{_includedir}/cdda_interface.h
 %{_includedir}/cdda_paranoia.h
 %{_includedir}/utils.h
diff --git a/cdparanoia-III-gcc43.patch b/cdparanoia-III-gcc43.patch
index 7ca11c7..2cbdab1 100644
--- a/cdparanoia-III-gcc43.patch
+++ b/cdparanoia-III-gcc43.patch
@@ -574,3 +574,18 @@ diff -urp cdparanoia-III-10.2.orig/interface/test_interface.c cdparanoia-III-10.
  
  #ifdef CDDA_TEST_UNDERRUN
    sectors-=1;
+--- cdparanoia-III-10.2/main.c~	2008-09-11 23:11:02.000000000 +0200
++++ cdparanoia-III-10.2/main.c	2013-10-10 22:00:49.779961678 +0200
+@@ -588,10 +588,10 @@
+ 	    buffer[aheadposition+19]='>';
+ 	}
+    
+-	fprintf(stderr,buffer);
++	fprintf(stderr,"%s", buffer);
+        
+ 	if (logfile != NULL && function==-1) {
+-	  fprintf(logfile,buffer+1);
++	  fprintf(logfile,"%s", buffer+1);
+ 	  fprintf(logfile,"\n\n");
+ 	  fflush(logfile);
+ 	}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cdparanoia-III.git/commitdiff/288f38ec3625e6dd02fc4f4346c4fda46d70d1b8



More information about the pld-cvs-commit mailing list