From 5c98c34ebcd1c2bacbb7ecfa50b2c39e43fa7821 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Sat, 22 Dec 2012 20:20:59 +0100
Subject: [PATCH] provide include files also in the paranoia directory (like in
 upstream's git)

---
 libcdio-paranoia.spec | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/libcdio-paranoia.spec b/libcdio-paranoia.spec
index f2c83eb..81bb130 100644
--- a/libcdio-paranoia.spec
+++ b/libcdio-paranoia.spec
@@ -1,6 +1,6 @@
 Name: libcdio-paranoia
 Version: 10.2+0.90
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: CD paranoia on top of libcdio
 Group: System Environment/Libraries
 License: GPLv2+ and LGPLv2+
@@ -45,8 +45,9 @@ This package contains header files and libraries for %{name}.
 %patch1 -p1
 %patch2 -p1
 
-# fix wrong installation of header files
-sed -i -e "s,includedir)/cdio,includedir)/cdio/paranoia,g" include/cdio/paranoia/Makefile.in 
+# fix pkgconfig files
+sed -i -e 's,-I${includedir},-I${includedir}/cdio,g' libcdio_paranoia.pc.in
+sed -i -e 's,-I${includedir},-I${includedir}/cdio,g' libcdio_cdda.pc.in
 
 f=doc/ja/cd-paranoia.1.in
 iconv -f euc-jp -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -72,6 +73,12 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja}
 
+# copy include files to an additional directory
+# this will probably be the location for future releases see:
+# https://github.com/rocky/libcdio-paranoia/commit/b2807f3c7a4126b6078d96adbd37c3760b9f41ab
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/cdio/paranoia
+cp -a $RPM_BUILD_ROOT%{_includedir}/cdio/*.h $RPM_BUILD_ROOT%{_includedir}/cdio/paranoia
+
 # remove rpath
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/*
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so.*
@@ -92,12 +99,18 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so.*
 %files devel
 %defattr(-,root,root,-)
 %doc doc/FAQ.txt doc/overlapdef.txt
-%{_includedir}/cdio
+%{_includedir}/cdio/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Sat Dec 22 2012 Adrian Reber <adrian@lisas.de> - 10.2+0.90-5
+- provide include files also in the paranoia directory (like in upstream's git)
+
+* Thu Nov 22 2012 Adrian Reber <adrian@lisas.de> - 10.2+0.90-4
+- fix pkgconfig files to point to right include directory
+
 * Mon Nov 05 2012 Adrian Reber <adrian@lisas.de> - 10.2+0.90-3
 - included upstreamed patches which are changing the license
   headers to be LGPLv2+ for the library parts and GPLv2+ for the