Fix pkg-config flags.

This commit is contained in:
Jon Ciesla 2014-02-20 14:45:40 -06:00
parent 8c2bf34755
commit 95fd203a66
2 changed files with 49 additions and 1 deletions

View File

@ -0,0 +1,42 @@
--- libraw.pc.in~ 2014-01-17 07:38:31.000000000 -0600
+++ libraw.pc.in 2014-02-20 14:18:20.559279964 -0600
@@ -7,5 +7,6 @@
Description: Raw image decoder library (non-thread-safe)
Requires: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
+Libs: -L${libdir} -lraw@PC_OPENMP@
+Libs.private: -lstdc++
Cflags: -I${includedir}/libraw
--- libraw_r.pc.in~ 2014-01-17 07:38:31.000000000 -0600
+++ libraw_r.pc.in 2014-02-20 14:20:35.740276947 -0600
@@ -7,5 +7,6 @@
Description: Raw image decoder library (thread-safe)
Requires: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
+Libs: -L${libdir} -lraw_r@PC_OPENMP@
+Libs.private: -lstdc++
Cflags: -I${includedir}/libraw
--- libraw_r.pc.in~ 2014-02-20 14:22:36.000000000 -0600
+++ libraw_r.pc.in 2014-02-20 14:27:24.454267828 -0600
@@ -5,7 +5,7 @@
Name: libraw
Description: Raw image decoder library (thread-safe)
-Requires: @PACKAGE_REQUIRES@
+Requires.private: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lraw_r@PC_OPENMP@
Libs.private: -lstdc++
--- libraw.pc.in~ 2014-02-20 14:22:36.000000000 -0600
+++ libraw.pc.in 2014-02-20 14:27:18.368267964 -0600
@@ -5,7 +5,7 @@
Name: libraw
Description: Raw image decoder library (non-thread-safe)
-Requires: @PACKAGE_REQUIRES@
+Requires.private: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lraw@PC_OPENMP@
Libs.private: -lstdc++

View File

@ -1,7 +1,7 @@
Summary: Library for reading RAW files obtained from digital photo cameras Summary: Library for reading RAW files obtained from digital photo cameras
Name: LibRaw Name: LibRaw
Version: 0.16.0 Version: 0.16.0
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Group: Development/Libraries Group: Development/Libraries
URL: http://www.libraw.org URL: http://www.libraw.org
@ -12,6 +12,7 @@ BuildRequires: jasper-devel
Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz
Source1: http://www.libraw.org/data/%{name}-demosaic-pack-GPL2-%{version}.tar.gz Source1: http://www.libraw.org/data/%{name}-demosaic-pack-GPL2-%{version}.tar.gz
Source2: http://www.libraw.org/data/%{name}-demosaic-pack-GPL3-%{version}.tar.gz Source2: http://www.libraw.org/data/%{name}-demosaic-pack-GPL3-%{version}.tar.gz
Patch0: LibRaw-0.6.0-pkgconfig.patch
%description %description
LibRaw is a library for reading RAW files obtained from digital photo LibRaw is a library for reading RAW files obtained from digital photo
@ -48,6 +49,8 @@ LibRaw sample programs
%prep %prep
%setup -q -a1 -a2 %setup -q -a1 -a2
%patch0 -p0 -b .pkgconfig
%build %build
%configure --enable-examples=yes --enable-jasper --enable-lcms \ %configure --enable-examples=yes --enable-jasper --enable-lcms \
--enable-demosaic-pack-gpl2 --enable-demosaic-pack-gpl3 --enable-demosaic-pack-gpl2 --enable-demosaic-pack-gpl3
@ -89,6 +92,9 @@ make install DESTDIR=%{buildroot}
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Thu Feb 20 2014 Jon Ciesla <limburgher@gmail.com> - 0.16.0-2
- Fix pkg-config flags, BZ 837248.
* Tue Jan 21 2014 Jon Ciesla <limburgher@gmail.com> - 0.16.0-1 * Tue Jan 21 2014 Jon Ciesla <limburgher@gmail.com> - 0.16.0-1
- 0.16.0, BZ 1055281. - 0.16.0, BZ 1055281.