ported from cdda-paranoia to libcdio-paranoia, modified paranoia-cdda.patch

- fixed bogus date in changelog

cdrkit-1.1.11-paranoiacdda.patch

@@ -25,10 +25,10 @@ diff -up cdrkit-1.1.11/icedax/CMakeLists.txt.paranoiacdda cdrkit-1.1.11/icedax/C
  ENDIF(HAVE_LIBOSSAUDIO)
  
 -LIST(APPEND EXTRA_LIBS  paranoia)
-+CHECK_INCLUDE_FILES(cdda/cdda_interface.h HAVE_CDDA_INTERFACE_H)
-+CHECK_LIBRARY_EXISTS (cdda_paranoia paranoia_init "" HAVE_LIBPARANOIA)
++CHECK_INCLUDE_FILES(cdio/cdda.h HAVE_CDDA_INTERFACE_H)
++CHECK_LIBRARY_EXISTS (cdio_paranoia cdio_paranoia_init "" HAVE_LIBPARANOIA)
 +IF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
-+   LIST(APPEND EXTRA_LIBS cdda_paranoia cdda_interface)
++   LIST(APPEND EXTRA_LIBS cdio_paranoia cdio_cdda)
 +ELSE(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
 +   MESSAGE(FATAL_ERROR "You need cdparanoia library installed")
 +ENDIF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
@@ -51,8 +51,8 @@ diff -up cdrkit-1.1.11/icedax/global.h.paranoiacdda cdrkit-1.1.11/icedax/global.
  #endif
  #ifdef	USE_PARANOIA
 -#include "cdda_paranoia.h"
-+#include <cdda/cdda_interface.h>
-+#include <cdda/cdda_paranoia.h>
++#include <cdio/cdda.h>
++#include <cdio/paranoia.h>
  #endif
  
  typedef struct index_list
@@ -79,8 +79,8 @@ diff -up cdrkit-1.1.11/icedax/icedax.c.paranoiacdda cdrkit-1.1.11/icedax/icedax.
  #include "mp3.h"	/* mp3 file handling */
  #endif
 +#ifdef	USE_PARANOIA
-+#include <cdda/cdda_interface.h>
-+#include <cdda/cdda_paranoia.h>
++#include <cdio/cdda.h>
++#include <cdio/paranoia.h>
 +#endif
  #include "interface.h"  /* low level cdrom interfacing */
  #include "icedax.h"
@@ -118,7 +118,7 @@ diff -up cdrkit-1.1.11/icedax/icedax.c.paranoiacdda cdrkit-1.1.11/icedax/icedax.
  #endif
  #if defined USE_PARANOIA
 -    fputs( ", libparanoia", stderr );
-+    fputs( ", libcdda_paranoia", stderr );
++    fputs( ", libcdio_paranoia", stderr );
  #endif
      fputs( " support\n", stderr );
    }

cdrkit.spec

@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.11
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -23,6 +23,7 @@ Patch14: cdrkit-1.1.11-paranoiacdda.patch
 Patch15: cdrkit-1.1.11-utf8.patch
 Patch16: cdrkit-1.1.11-cmakewarn.patch
 Patch17: cdrkit-1.1.11-memset.patch
+Patch18: cdrkit-1.1.11-paranoiacdio.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
 
@@ -84,8 +85,8 @@ Requires: libusal = %{version}-%{release}
 Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
 Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 Requires: vorbis-tools
-Requires: cdparanoia
-BuildRequires: cdparanoia-devel
+Requires: cdparanoia libcdio-paranoia
+BuildRequires: cdparanoia-devel libcdio-paranoia-devel
 
 %description -n icedax
 Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -132,6 +133,7 @@ SCSI devices.
 %patch15 -p1
 %patch16 -p1 -b .cmakewarn
 %patch17 -p1 -b .edcspeed
+%patch18 -p1 -b .paranoiacdio
 
 # we do not want bundled paranoia library
 rm -rf libparanoia
@@ -292,6 +294,10 @@ fi
 %{_includedir}/usal
 
 %changelog
+* Wed Jul 17 2013 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.1.11-18
+- ported from cdda-paranoia to libcdio-paranoia, modified paranoia-cdda.patch
+- fixed bogus date in changelog
+
 * Mon Feb 25 2013 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.1.11-17
 - modified the memset patch, memsetting the whole array
 
@@ -376,7 +382,7 @@ fi
 * Fri Jul 10 2009 Adam Jackson <ajax@redhat.com> 1.1.9-7
 - Move dirsplit to a subpackage to isolate the perl dependency.
 
-* Tue Jun 15 2009 Roman Rakus <rrakus@redhat.com> - 1.1.9-6
+* Mon Jun 15 2009 Roman Rakus <rrakus@redhat.com> - 1.1.9-6
 - rename functions as they conflict with glibc
 - Don't push cdda2mp3 because we don't have any mp3 coder
   Resolves: #505918