[packages/exiv2] - upstreaem cmake fixes - rel 5

[baggins]

commit fa1aa107feff72bc13aa6698ee8969e3308be3bc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Mar 3 13:06:25 2019 +0100

    - upstreaem cmake fixes
    - rel 5

 cmake.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 exiv2.spec  | 13 +++++++------
 2 files changed, 61 insertions(+), 6 deletions(-)
---
diff --git a/exiv2.spec b/exiv2.spec
index f5bfad3..d928ec3 100644
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -7,12 +7,13 @@ Summary:	EXIF and IPTC metadata manipulation tools
 Summary(pl.UTF-8):	Narzędzia do obróbki metadanych EXIF i IPTC
 Name:		exiv2
 Version:	0.27.0a
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		Applications/Graphics
 #Source0Download: http://www.exiv2.org/download.html
 Source0:	http://www.exiv2.org/builds/%{name}-%{version}-Source.tar.gz
 # Source0-md5:	b7f49949deafa96a9e6a22d42bd91031
+Patch0:		cmake.patch
 URL:		http://www.exiv2.org/
 BuildRequires:	cmake >= 3.3.2
 %{?with_curl:BuildRequires:	curl-devel}
@@ -60,6 +61,7 @@ Pliki programistyczne biblioteki do obróbki metadanych EXIF i IPTC.
 
 %prep
 %setup -q -n %{name}-0.27.0-Source
+%patch0 -p1
 
 %build
 install -d build
@@ -100,9 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 # internally used Adobe XMP SDK
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libxmp.a
 
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/exiv2/cmake/*.cmake
-cp -p build-cmake/src/CMakeFiles/Export/share/exiv2/cmake/*.cmake \
-	$RPM_BUILD_ROOT%{_datadir}/exiv2/cmake/
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/cmake/exiv2/exiv2Config{,-pld}.cmake
+cp -p build-cmake/src/CMakeFiles/Export/_usr/%{_lib}/cmake/exiv2/exiv2Config{,-pld}.cmake \
+	$RPM_BUILD_ROOT%{_libdir}/cmake/exiv2/
 
 %find_lang %{name}
 
@@ -128,5 +130,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libexiv2.so
 %{_includedir}/exiv2
 %{_pkgconfigdir}/exiv2.pc
-%dir %{_datadir}/exiv2
-%{_datadir}/exiv2/cmake
+%{_libdir}/cmake/exiv2
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 0000000..fd4343b
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,54 @@
+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@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ca24006e..ed7f3e1c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -6,6 +6,7 @@ if( EXIV2_BUILD_UNIT_TESTS )
+     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) # Requires CMake 3.3.3
+ endif()
+ 
++include(CMakePackageConfigHelpers)
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+@@ -218,6 +206,7 @@ if( ICONV_FOUND )
+     target_link_libraries( exiv2lib PRIVATE Iconv::Iconv )
+ endif()
+ 
++write_basic_package_version_file(exiv2ConfigVersion.cmake COMPATIBILITY ExactVersion)
+ 
+ install(TARGETS exiv2lib EXPORT exiv2Config
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+@@ -225,7 +214,9 @@ install(TARGETS exiv2lib EXPORT exiv2Config
+     ${CMAKE_BINARY_DIR}/exiv2lib_export.h
+     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
+ 
+-install(EXPORT exiv2Config DESTINATION "share/exiv2/cmake")
++install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
++
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
+ 
+ # ******************************************************************************
+ # exiv2 application
+@@ -257,7 +244,7 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
+ 
+     if( EXIV2_ENABLE_NLS )
+         target_link_libraries(exiv2 PRIVATE ${Intl_LIBRARIES})
+-        target_include_directories(exiv2lib PRIVATE ${Intl_INCLUDE_DIRS})
++        target_include_directories(exiv2 PRIVATE ${Intl_INCLUDE_DIRS})
+     endif()
+ 
+     if (USING_CONAN AND WIN32 AND EXISTS ${PROJECT_BINARY_DIR}/conanDlls)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/exiv2.git/commitdiff/fa1aa107feff72bc13aa6698ee8969e3308be3bc