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

diff --git a/cdparanoia-III-gcc43.patch b/cdparanoia-III-gcc43.patch
index 7ca11c76ab7e6c6aacdf5a5a7c1e906c0b17c880..2cbdab15faedff192b2d06b2571e023e031ad5ee 100644 (file)
--- 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);
+       }

diff --git a/cdparanoia-III.spec b/cdparanoia-III.spec
index 514e9cba868f6f30bd0d002ff74a5b6f45638323..4c5b760dc7e9722682ec515179c0a318a753ad93 100644 (file)
--- 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