From 5b3b91134af39039fa7511e5cb8ac1c877464712 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 13 May 2020 14:32:30 +0200 Subject: [PATCH] Add back pkgconfig patch lost in the previous commit What the patch did was to move libstdc++ to private section, so that other packages that depend on LibRaw wouldn't be required to link against libstdc++. This should fix shotwell to build against LibRaw again. --- LibRaw-pkgconfig.patch | 26 ++++++++++++++++++++++++++ LibRaw.spec | 8 ++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 LibRaw-pkgconfig.patch diff --git a/LibRaw-pkgconfig.patch b/LibRaw-pkgconfig.patch new file mode 100644 index 0000000..5b60b03 --- /dev/null +++ b/LibRaw-pkgconfig.patch @@ -0,0 +1,26 @@ +--- LibRaw-0.20-Beta1/libraw.pc.in~ 2020-05-13 14:22:12.656424311 +0200 ++++ LibRaw-0.20-Beta1/libraw.pc.in 2020-05-13 14:22:27.481441569 +0200 +@@ -5,7 +5,8 @@ + + Name: libraw + Description: Raw image decoder library (non-thread-safe) +-Requires: @PACKAGE_REQUIRES@ ++Requires.private: @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 -I${includedir} +--- LibRaw-0.20-Beta1/libraw_r.pc.in~ 2020-05-13 14:22:18.034430572 +0200 ++++ LibRaw-0.20-Beta1/libraw_r.pc.in 2020-05-13 14:22:27.481441569 +0200 +@@ -5,7 +5,8 @@ + + Name: libraw + Description: Raw image decoder library (thread-safe) +-Requires: @PACKAGE_REQUIRES@ ++Requires.private: @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 -I${includedir} diff --git a/LibRaw.spec b/LibRaw.spec index 2353c2e..42e56d8 100644 --- a/LibRaw.spec +++ b/LibRaw.spec @@ -7,7 +7,7 @@ Summary: Library for reading RAW files obtained from digital photo cameras Name: LibRaw Version: 0.20 -Release: 0.beta1%{?dist} +Release: 0.beta1%{?dist}.1 License: BSD and (CDDL or LGPLv2) URL: http://www.libraw.org @@ -19,6 +19,7 @@ BuildRequires: autoconf automake libtool #Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz Source0: http://github.com/LibRaw/LibRaw/archive/%{version}-Beta1.tar.gz +Patch0: LibRaw-pkgconfig.patch Provides: bundled(dcraw) = 9.25 %description @@ -53,7 +54,7 @@ Requires: %{name} = %{version}-%{release} LibRaw sample programs %prep -%setup -qn %{name}-%{version}-Beta1 +%autosetup -p1 -n %{name}-%{version}-Beta1 %build autoreconf -if @@ -115,6 +116,9 @@ rm -fv %{buildroot}%{_libdir}/lib*.la %changelog +* Wed May 13 2020 Kalev Lember - 0.20-0.beta1.1 +- Add back pkgconfig patch lost in the previous commit + * Thu May 07 2020 Gwyn Ciesla - 0.20-0.beta1 - 0.20 Beta 1