rpms/libcdio/devel libcdio-0.80-paranoia-fix.patch, NONE, 1.1 libcdio.spec, 1.29, 1.30

[Tomas Bzatek (tbzatek)]

Author: tbzatek

Update of /cvs/extras/rpms/libcdio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23307

Modified Files:
	libcdio.spec 
Added Files:
	libcdio-0.80-paranoia-fix.patch 
Log Message:
* Wed Jun  4 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.80-2
- added patch enabling libcdio_paranoia.pc


libcdio-0.80-paranoia-fix.patch:

--- NEW FILE libcdio-0.80-paranoia-fix.patch ---
diff -up libcdio-0.80/Makefile.am.bak libcdio-0.80/Makefile.am
--- libcdio-0.80/Makefile.am.bak	2008-03-15 17:21:28.000000000 +0100
+++ libcdio-0.80/Makefile.am	2008-06-04 17:23:13.942500222 +0200
@@ -20,6 +20,10 @@
 ##   which configure then turns into a Makefile  ...
 ##     which make can then use to produce stuff. Isn't configuration simple? 
 
+if BUILD_CD_PARANOIA
+paranoiadist = libcdio_paranoia.pc.in 
+endif
+
 EXTRA_DIST = \
 	MSVC/README MSVC/cd-info.vcproj \
 	MSVC/config.h \
@@ -34,7 +38,8 @@ EXTRA_DIST = \
 	libiso9660.pc.in \
 	libiso9660++.pc.in \
 	libudf.pc.in \
-	package/libcdio.spec.in 
+	package/libcdio.spec.in \
+	$(paranoiadist)
 
 SUBDIRS = doc include lib src test example
 
@@ -48,7 +53,7 @@ pkgconfig_DATA = libcdio.pc  \
 	         libcdio++.pc  \
 	         libiso9660.pc \
 	         libiso9660++.pc \
-	         libudf.pc
+	         libudf.pc \
 		 $(paranoiapcs)
 
 


Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libcdio.spec	30 May 2008 07:25:36 -0000	1.29
+++ libcdio.spec	5 Jun 2008 08:11:21 -0000	1.30
@@ -1,6 +1,6 @@
 Name: libcdio
 Version: 0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: CD-ROM input and control library
 Group: System Environment/Libraries
 License: GPLv2+
@@ -15,6 +15,11 @@
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
+# The patch touches Makefile.am files:
+BuildRequires: automake autoconf
+Patch1: libcdio-0.80-paranoia-fix.patch
+
+
 %description
 This library provides an interface for CD-ROM access. It can be used
 by applications that need OS- and device-independent access to CD-ROM
@@ -32,11 +37,14 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .paranoia_pc
+
 f=src/cd-paranoia/doc/ja/cd-paranoia.1.in
 iconv -f euc-jp -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
 
 
 %build
+automake  || :
 %configure \
 	--disable-vcd-info \
 	--disable-dependency-tracking \
@@ -110,6 +118,9 @@
 
 
 %changelog
+* Wed Jun  4 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.80-2
+- added patch enabling libcdio_paranoia.pc
+
 * Thu May 29 2008 Adrian Reber <adrian at lisas.de> - 0.80-1
 - updated to 0.80
 - removed upstreamed patches