From 91d3000d58a9225d07f6f65fd525bf66ff9fba9a Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 5 Jun 2008 08:11:21 +0000 Subject: [PATCH] - added patch enabling libcdio_paranoia.pc --- libcdio-0.80-paranoia-fix.patch | 33 +++++++++++++++++++++++++++++++++ libcdio.spec | 13 ++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 libcdio-0.80-paranoia-fix.patch diff --git a/libcdio-0.80-paranoia-fix.patch b/libcdio-0.80-paranoia-fix.patch new file mode 100644 index 0000000..a8ad5b9 --- /dev/null +++ b/libcdio-0.80-paranoia-fix.patch @@ -0,0 +1,33 @@ +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) + + diff --git a/libcdio.spec b/libcdio.spec index 0170646..0f6335d 100644 --- a/libcdio.spec +++ b/libcdio.spec @@ -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/ldconfig 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 @@ This package contains header files and static libraries for %{name}. %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 @@ fi %changelog +* Wed Jun 4 2008 Tomas Bzatek - 0.80-2 +- added patch enabling libcdio_paranoia.pc + * Thu May 29 2008 Adrian Reber - 0.80-1 - updated to 0.80 - removed upstreamed patches