[packages/exiv2] - updated to 0.27.1 - updated cmake patch (support absolute CMAKE_INSTALL_*DIR) - updated no-xmpsdk-
qboosh
qboosh at pld-linux.org
Wed Jul 24 22:03:15 CEST 2019
commit 424f4566b55bc3f1bc8b9dc72e8520597592f013
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jul 24 22:05:10 2019 +0200
- updated to 0.27.1
- updated cmake patch (support absolute CMAKE_INSTALL_*DIR)
- updated no-xmpsdk-install patch
cmake.patch | 52 ++++++++++---------------------------------
exiv2-no-xmpsdk-install.patch | 21 +++++------------
exiv2.spec | 14 ++++++------
3 files changed, 24 insertions(+), 63 deletions(-)
---
diff --git a/exiv2.spec b/exiv2.spec
index 2e1383c..fc07705 100644
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -6,16 +6,16 @@
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: 5
+Version: 0.27.1
+Release: 1
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
+#Source0Download: https://www.exiv2.org/download.html
+Source0: https://www.exiv2.org/builds/%{name}-%{version}-Source.tar.gz
+# Source0-md5: 56d064517ae5903dd963b84514a121c1
Patch0: cmake.patch
Patch1: %{name}-no-xmpsdk-install.patch
-URL: http://www.exiv2.org/
+URL: https://www.exiv2.org/
BuildRequires: cmake >= 3.3.2
%{?with_curl:BuildRequires: curl-devel}
BuildRequires: expat-devel
@@ -62,7 +62,7 @@ EXIF and IPTC metadata manipulation library development files.
Pliki programistyczne biblioteki do obróbki metadanych EXIF i IPTC.
%prep
-%setup -q -n %{name}-0.27.0-Source
+%setup -q -n %{name}-%{version}-Source
%patch0 -p1
%patch1 -p1
diff --git a/cmake.patch b/cmake.patch
index fd4343b..823b0b9 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,54 +1,26 @@
-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
+--- exiv2-0.27.1-Source/cmake/exiv2.pc.in.orig 2019-07-24 21:28:15.100120602 +0200
++++ exiv2-0.27.1-Source/cmake/exiv2.pc.in 2019-07-24 21:29:32.043037100 +0200
@@ -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@
+-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_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
+--- exiv2-0.27.1-Source/src/CMakeLists.txt.orig 2019-04-26 11:31:16.000000000 +0200
++++ exiv2-0.27.1-Source/src/CMakeLists.txt 2019-07-24 21:40:31.712796695 +0200
+@@ -239,9 +239,9 @@
${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}/exiv2/cmake")
+install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
-+
+
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
+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)
diff --git a/exiv2-no-xmpsdk-install.patch b/exiv2-no-xmpsdk-install.patch
index e21b641..f86c9d1 100644
--- a/exiv2-no-xmpsdk-install.patch
+++ b/exiv2-no-xmpsdk-install.patch
@@ -1,23 +1,12 @@
---- exiv2-0.27.0-Source/xmpsdk/CMakeLists.txt.orig 2018-12-20 14:45:17.000000000 +0100
-+++ exiv2-0.27.0-Source/xmpsdk/CMakeLists.txt 2019-03-03 11:01:53.674620695 +0100
-@@ -50,9 +50,3 @@
+--- exiv2-0.27.1-Source/xmpsdk/CMakeLists.txt.orig 2019-07-24 21:30:12.869482590 +0200
++++ exiv2-0.27.1-Source/xmpsdk/CMakeLists.txt 2019-07-24 21:31:52.508942797 +0200
+@@ -54,9 +54,3 @@
if (BUILD_SHARED_LIBS)
- set_property(TARGET xmp PROPERTY POSITION_INDEPENDENT_CODE ON)
+ set_property(TARGET exiv2-xmp PROPERTY POSITION_INDEPENDENT_CODE ON)
endif()
-
-# 1119 Install libxmp.a for use by third party applications (Thanks, Emmanuel)
--install(TARGETS xmp EXPORT exiv2Config
+-install(TARGETS exiv2-xmp EXPORT exiv2Config
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
---- exiv2-0.27.0-Source/src/CMakeLists.txt.orig 2018-12-20 14:45:16.000000000 +0100
-+++ exiv2-0.27.0-Source/src/CMakeLists.txt 2019-03-03 13:59:23.100261141 +0100
-@@ -147,7 +147,7 @@
- target_include_directories(exiv2lib PRIVATE ${ZLIB_INCLUDE_DIR})
-
- if (EXIV2_ENABLE_XMP)
-- target_link_libraries(exiv2lib PUBLIC xmp)
-+ target_link_libraries(exiv2lib PRIVATE xmp)
- elseif(EXIV2_ENABLE_EXTERNAL_XMP)
- target_link_libraries(exiv2lib PUBLIC ${XMPSDK_LIBRARY})
- target_include_directories(exiv2lib PUBLIC ${XMPSDK_INCLUDE_DIR})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/exiv2.git/commitdiff/424f4566b55bc3f1bc8b9dc72e8520597592f013
More information about the pld-cvs-commit
mailing list