[packages/libcdio-paranoia] - added headers patch (from git: install headers to cdio/paranoia subdir) - release 2

qboosh qboosh at pld-linux.org
Thu Dec 6 18:58:20 CET 2012


commit 3d5b94631b5332a813bf658490a0b99d2f54d221
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Dec 6 18:58:50 2012 +0100

    - added headers patch (from git: install headers to cdio/paranoia subdir)
    - release 2

 libcdio-paranoia-headers.patch | 13 +++++++++++++
 libcdio-paranoia.spec          |  8 ++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/libcdio-paranoia.spec b/libcdio-paranoia.spec
index 6d03106..4f16450 100644
--- a/libcdio-paranoia.spec
+++ b/libcdio-paranoia.spec
@@ -7,12 +7,12 @@ Summary(pl.UTF-8):	Biblioteki paranoia CD-DA z libcdio
 Name:		libcdio-paranoia
 Version:	0.90
 %define	paranoia_ver	10.2
-Release:	1
+Release:	2
 License:	LGPL v2.1 (library), GPL v2 (utility)
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/libcdio/%{name}-%{paranoia_ver}+%{version}.tar.gz
 # Source0-md5:	7175764764c7fa22e1b802b9526c9411
-#Patch0:		%{name}-info.patch
+Patch0:		%{name}-headers.patch
 URL:		http://www.gnu.org/software/libcdio/
 BuildRequires:	autoconf >= 2.67
 BuildRequires:	automake >= 1:1.8.3
@@ -74,6 +74,7 @@ Narzędzie używające libcdio-paranoia: cd-paranoia.
 
 %prep
 %setup -q -n %{name}-%{paranoia_ver}+%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -114,8 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libcdio_paranoia.so
 %{_libdir}/libcdio_cdda.la
 %{_libdir}/libcdio_paranoia.la
-%{_includedir}/cdio/cdda.h
-%{_includedir}/cdio/paranoia.h
+%{_includedir}/cdio/paranoia
 %{_pkgconfigdir}/libcdio_cdda.pc
 %{_pkgconfigdir}/libcdio_paranoia.pc
 
diff --git a/libcdio-paranoia-headers.patch b/libcdio-paranoia-headers.patch
new file mode 100644
index 0000000..9bdde3b
--- /dev/null
+++ b/libcdio-paranoia-headers.patch
@@ -0,0 +1,13 @@
+--- libcdio-paranoia-10.2+0.90/include/cdio/paranoia/Makefile.am.orig	2011-11-05 21:11:17.000000000 +0100
++++ libcdio-paranoia-10.2+0.90/include/cdio/paranoia/Makefile.am	2012-12-06 18:56:26.095291751 +0100
+@@ -3,8 +3,8 @@
+ ########################################################
+ #
+ 
+-libcdioincludedir=$(includedir)/cdio
+-dist_libcdioinclude_HEADERS = cdda.h paranoia.h 
++cdio_paranoia_includedir=$(includedir)/cdio/paranoia
++dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h 
+ 
+ EXTRA_DIST = version.h.in
+ BUILT_SOURCES = version.h
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libcdio-paranoia.git/commitdiff/3d5b94631b5332a813bf658490a0b99d2f54d221



More information about the pld-cvs-commit mailing list