From 85c5dfb4bb4f5a68295b1f4a62497342d6483aec Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Wed, 30 Jan 2019 18:10:02 -0600
Subject: [PATCH] pull in upstream fix for pkgconfig exiv2.pc

---
 ...e-for-being-compatible-with-more-dis.patch | 27 +++++++++++++++++++
 exiv2.spec                                    | 11 ++++----
 2 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 0079-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch

diff --git a/0079-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch b/0079-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch
new file mode 100644
index 0000000..c65f13b
--- /dev/null
+++ b/0079-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch
@@ -0,0 +1,27 @@
+From ae9eb90108c0f6a3f2030cf4e4ae907a8b203b6a Mon Sep 17 00:00:00 2001
+From: Luis Diaz Mas <piponazo@gmail.com>
+Date: Sat, 12 Jan 2019 13:39:12 +0100
+Subject: [PATCH 79/98] Fixes in .pc file for being compatible with more
+ distributions
+
+---
+ cmake/exiv2.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/exiv2.pc.in b/cmake/exiv2.pc.in
+index e477696d..9018472b 100644
+--- a/cmake/exiv2.pc.in
++++ b/cmake/exiv2.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib
+-includedir=${prefix}/include
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: exiv2
+ Description: @PROJECT_DESCRIPTION@
+-- 
+2.17.2
+
diff --git a/exiv2.spec b/exiv2.spec
index a3f594a..04c8215 100644
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -2,7 +2,7 @@
 Summary: Exif and Iptc metadata manipulation library
 Name:    exiv2
 Version: 0.27.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 URL:     http://www.exiv2.org/
@@ -18,6 +18,7 @@ Patch66: 0066-cmake-Use-correct-installation-dir-for-generated-doc.patch
 Patch67: 0067-cmake-Use-correct-installation-dir-for-cmake-config-.patch
 Patch68: 0068-xmpsdk-Build-with-DBanAllEntityUsage-1.patch
 Patch69: 0069-xmpsdk-Fix-compile-warnings-in-ExpatAdapter.cpp.patch
+Patch79: 0079-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch
 
 BuildRequires: cmake
 BuildRequires: expat-devel
@@ -73,9 +74,6 @@ BuildArch: noarch
 %prep
 %autosetup -n %{name}-%{version}-Source -p1
 
-# FIX exiv2.pc libdir definiton to not hardcode prefix/lib
-# FIXME upstream! -- rex
-sed -i -e "s|^libdir=\${prefix}/lib$|libdir=\${prefix}/%{_lib}|g" cmake/exiv2.pc.in
 
 %build
 
@@ -100,7 +98,7 @@ rm -fv %{buildroot}%{_libdir}/libexiv2.la
 
 
 %check
-export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
+export PKG_CONFIG_PATH="%{buildroot}%{_libdir}/pkgconfig${PKG_CONFIG_PATH:+:}${PKG_CONFIG_PATH}"
 test "$(pkg-config --modversion exiv2)" = "%{version}"
 test "$(pkg-config --variable=libdir exiv2)" = "%{_libdir}"
 test -x %{buildroot}%{_libdir}/libexiv2.so
@@ -133,6 +131,9 @@ test -x %{buildroot}%{_libdir}/libexiv2.so
 
 
 %changelog
+* Wed Jan 30 2019 Rex Dieter <rdieter@fedoraproject.org> - 0.27.0-2
+- pull in upstream fix for pkgconfig exiv2.pc
+
 * Thu Jan 10 2019 Rex Dieter <rdieter@fedoraproject.org> - 0.27.0-1
 - exiv2-0.27.0 (#1665246)