[cdrkit] Revert to cdda-paranoia, libcdio has now incompatible GPLv3+ license. Revert "ported from cdda-paran

[Frantisek Kluknavsky]

commit a4cafe97ff1ca9d6a61e2f9e609bf77840935d3d
Author: Frantisek Kluknavsky <fkluknav at redhat.com>
Date:   Fri Nov 7 13:02:13 2014 +0100

    Revert to cdda-paranoia, libcdio has now incompatible GPLv3+ license.
    Revert "ported from cdda-paranoia to libcdio-paranoia, modified paranoia-cdda.patch"
    
    This reverts commit 763f5bd6c288397a0157afa91b8bd0c4b6019d47.
    
    Conflicts:
    	cdrkit.spec

 cdrkit-1.1.11-paranoiacdda.patch |   16 +-
 cdrkit-1.1.11-paranoiacdio.patch | 2857 --------------------------------------
 cdrkit.spec                      |   13 +-
 3 files changed, 15 insertions(+), 2871 deletions(-)
---
diff --git a/cdrkit-1.1.11-paranoiacdda.patch b/cdrkit-1.1.11-paranoiacdda.patch
index 9d17899..062971d 100644
--- a/cdrkit-1.1.11-paranoiacdda.patch
+++ b/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(cdio/cdda.h HAVE_CDDA_INTERFACE_H)
-+CHECK_LIBRARY_EXISTS (cdio_paranoia cdio_paranoia_init "" HAVE_LIBPARANOIA)
++CHECK_INCLUDE_FILES(cdda/cdda_interface.h HAVE_CDDA_INTERFACE_H)
++CHECK_LIBRARY_EXISTS (cdda_paranoia paranoia_init "" HAVE_LIBPARANOIA)
 +IF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
-+   LIST(APPEND EXTRA_LIBS cdio_paranoia cdio_cdda)
++   LIST(APPEND EXTRA_LIBS cdda_paranoia cdda_interface)
 +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 <cdio/cdda.h>
-+#include <cdio/paranoia.h>
++#include <cdda/cdda_interface.h>
++#include <cdda/cdda_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 <cdio/cdda.h>
-+#include <cdio/paranoia.h>
++#include <cdda/cdda_interface.h>
++#include <cdda/cdda_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( ", libcdio_paranoia", stderr );
++    fputs( ", libcdda_paranoia", stderr );
  #endif
      fputs( " support\n", stderr );
    }
diff --git a/cdrkit.spec b/cdrkit.spec
index 8be990f..c3ed476 100644
--- a/cdrkit.spec
+++ b/cdrkit.spec
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.11
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -23,7 +23,6 @@ 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
 Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
@@ -86,8 +85,8 @@ Requires: libusal = %{version}-%{release}
 Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
 Requires(post): %{_sbindir}/alternatives chkconfig coreutils
 Requires: vorbis-tools
-Requires: cdparanoia libcdio-paranoia
-BuildRequires: cdparanoia-devel libcdio-paranoia-devel
+Requires: cdparanoia
+BuildRequires: cdparanoia-devel
 
 %description -n icedax
 Icedax is a sampling utility for CD-ROM drives that are capable of
@@ -134,7 +133,6 @@ SCSI devices.
 %patch15 -p1
 %patch16 -p1 -b .cmakewarn
 %patch17 -p1 -b .edcspeed
-%patch18 -p1 -b .paranoiacdio
 %patch19 -p1 -b .elfheader
 
 # we do not want bundled paranoia library
@@ -300,6 +298,9 @@ fi
 %{_includedir}/usal
 
 %changelog
+* Fri Nov 07 2014 Frantisek Kluknavsky <fkluknav at redhat.com> - 1.1.11-26
+- reverted back to cdda-paranoia, cdio has now incompatible GPLv3+ license
+
 * Wed Nov 05 2014 Dan Horák <dan[at]danny.cz> - 1.1.11-25
 - fix build on ppc* (#1144072)
 
@@ -409,7 +410,7 @@ fi
 * Fri Jul 10 2009 Adam Jackson <ajax at redhat.com> 1.1.9-7
 - Move dirsplit to a subpackage to isolate the perl dependency.
 
-* Mon Jun 15 2009 Roman Rakus <rrakus at redhat.com> - 1.1.9-6
+* Tue Jun 15 2009 Roman Rakus <rrakus at 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