From bed4a6c6ef5fa07fd134906ba8a7c04031d26d8d0eac043e84e5289f2b18c009 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 27 Jul 2018 06:46:19 +0000 Subject: [PATCH] Accepting request 625017 from home:1Antoine1:branches:devel:libraries:c_c++ - Install pc file: * Add pugixml-1.9-install-pc-file.patch (picked from upstream). * Add pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch (picked from upstream). OBS-URL: https://build.opensuse.org/request/show/625017 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/pugixml?expand=0&rev=13 --- pugixml-1.9-install-pc-file.patch | 71 ++++++++++++++++++++++ pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch | 39 ++++++++++++ pugixml.changes | 8 +++ pugixml.spec | 12 +++- 4 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 pugixml-1.9-install-pc-file.patch create mode 100644 pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch diff --git a/pugixml-1.9-install-pc-file.patch b/pugixml-1.9-install-pc-file.patch new file mode 100644 index 0000000..119ecd0 --- /dev/null +++ b/pugixml-1.9-install-pc-file.patch @@ -0,0 +1,71 @@ +From daeb8013b20f9c47e85730faaa4131064a1f9c2e Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Mon, 9 Apr 2018 13:48:53 -0400 +Subject: [PATCH] cmake: always install the pkg-config file (#193) + +There's really never a reason to *not* want this installed. If an option +is needed to specify installing in a versioned subdirectory, this option +should be explicitly described rather than hidden in something else. + +As an added bonus, this makes the CMake install code slightly *less* +complicated. +--- + CMakeLists.txt | 10 ++++------ + scripts/pugixml.pc.in | 6 +++--- + 2 files changed, 7 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 90fa6793..d7bc1b20 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,7 @@ project(pugixml) + + option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) + option(BUILD_TESTS "Build tests" OFF) +-option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF) ++option(USE_VERSIONED_LIBDIR "Use a private subdirectory to install the headers and libs" OFF) + + set(BUILD_DEFINES "" CACHE STRING "Build defines") + +@@ -55,7 +55,7 @@ endif() + set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1) + get_target_property(PUGIXML_VERSION_STRING pugixml VERSION) + +-if(BUILD_PKGCONFIG) ++if(USE_VERSIONED_LIBDIR) + # Install library into its own directory under LIBDIR + set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING}) + endif() +@@ -71,10 +71,8 @@ install(TARGETS pugixml EXPORT pugixml-config + install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}) + install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) + +-if(BUILD_PKGCONFIG) +- configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) +- install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) +-endif() ++configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) ++install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) + + if(BUILD_TESTS) + file(GLOB TEST_SOURCES tests/*.cpp) +diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in +index 3c97c28d..804c4d38 100644 +--- a/scripts/pugixml.pc.in ++++ b/scripts/pugixml.pc.in +@@ -1,11 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-includedir=${prefix}/include/pugixml-@PUGIXML_VERSION_STRING@ +-libdir=${exec_prefix}/lib/pugixml-@PUGIXML_VERSION_STRING@ ++includedir=${prefix}/include@INSTALL_SUFFIX@ ++libdir=${exec_prefix}/lib@INSTALL_SUFFIX@ + + Name: pugixml + Description: Light-weight, simple and fast XML parser for C++ with XPath support. + URL: http://pugixml.org/ + Version: @PUGIXML_VERSION_STRING@ + Cflags: -I${includedir} +-Libs: -L${libdir} -lpugixml +\ No newline at end of file ++Libs: -L${libdir} -lpugixml diff --git a/pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch b/pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch new file mode 100644 index 0000000..f90fe8c --- /dev/null +++ b/pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch @@ -0,0 +1,39 @@ +From c12889f7ccee3a91754f12a4f5b2bf5eb87acabd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= +Date: Wed, 27 Jun 2018 00:53:42 +0200 +Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for pugixml.pc (#215) + +- Up to now, the libdir was hardcoded to "lib" inside pugixml.pc and + the install directory of pugixml.pc was "lib/pkgconfig" +- Adds support for lib and lib64 by using CMAKE_INSTALL_LIBDIR variable +--- + CMakeLists.txt | 2 +- + scripts/pugixml.pc.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 148f7b0d..d322a631 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,7 +76,7 @@ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX + install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) + + configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) +-install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ++install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + if(BUILD_TESTS) + file(GLOB TEST_SOURCES tests/*.cpp) +diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in +index 04b4d3b0..fbb7f8b8 100644 +--- a/scripts/pugixml.pc.in ++++ b/scripts/pugixml.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} + includedir=${prefix}/include@INSTALL_SUFFIX@ +-libdir=${exec_prefix}/lib@INSTALL_SUFFIX@ ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@@INSTALL_SUFFIX@ + + Name: pugixml + Description: Light-weight, simple and fast XML parser for C++ with XPath support. diff --git a/pugixml.changes b/pugixml.changes index e5d370f..2190e1a 100644 --- a/pugixml.changes +++ b/pugixml.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 24 10:27:08 UTC 2018 - antoine.belvire@opensuse.org + +- Install pc file: + * Add pugixml-1.9-install-pc-file.patch (picked from upstream). + * Add pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch (picked from + upstream). + ------------------------------------------------------------------- Tue Apr 10 19:06:38 UTC 2018 - bjoern@schramke-online.de diff --git a/pugixml.spec b/pugixml.spec index ad656de..cadb46f 100644 --- a/pugixml.spec +++ b/pugixml.spec @@ -26,9 +26,14 @@ Group: System/Libraries Url: http://pugixml.org/ Source0: https://github.com/zeux/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz Patch1: pugixml-config.patch +# PATCH-FIX-UPSTREAM pugixml-1.9-install-pc-file.patch -- Always install pc file +Patch2: pugixml-1.9-install-pc-file.patch +# PATCH-FIX-UPSTREAM pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch -- Install pc file in proper libdir +Patch3: pugixml-1.9-use-CMAKE_INSTALL_LIBDIR.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,11 +74,11 @@ pugixml is a light-weight C++ XML processing library. It features: The library is extremely portable and easy to integrate and use. %prep -%setup -q -%patch1 -p1 +%autosetup -p1 %build -%cmake +# CMAKE_INSTALL_LIBDIR is used as a relative path by upstream +%cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} make %{?_smp_mflags} %install @@ -88,6 +93,7 @@ make %{?_smp_mflags} %doc readme.txt docs/* %{_includedir}/*.hpp %{_libdir}/cmake/* +%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/*.so %files -n %{_libname}