- updated to 1.9

- updated pc patch

diff --git a/pugixml-pc.patch b/pugixml-pc.patch
index 365cc5d741562ac13f6632444e3b116fdd2947fe..522d414270e82cebc68c628440458e5e00b95d49 100644 (file)
--- a/pugixml-pc.patch
+++ b/pugixml-pc.patch
@@ -1,7 +1,7 @@
---- pugixml-1.8/CMakeLists.txt.orig    1970-01-01 01:00:00.000000000 +0100
-+++ pugixml-1.8/CMakeLists.txt 2017-02-25 14:36:09.707346051 +0100
-@@ -50,11 +50,6 @@
- set_target_properties(pugixml PROPERTIES VERSION 1.8 SOVERSION 1)
+--- pugixml-1.9/CMakeLists.txt.orig    2018-04-04 16:53:16.000000000 +0200
++++ pugixml-1.9/CMakeLists.txt 2018-12-01 21:26:48.544256728 +0100
+@@ -55,11 +55,6 @@
+ set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1)
  get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)
  
 -if(BUILD_PKGCONFIG)
@@ -9,15 +9,15 @@
 -      set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
 -endif()
 -
- install(TARGETS pugixml EXPORT pugixml-config
-       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
-       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
-@@ -64,7 +59,7 @@
+ target_include_directories(pugixml PUBLIC
+       $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>
+       $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}>)
+@@ -73,7 +68,7 @@
  
  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)
-+      install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
++      install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
  endif()
  
  if(BUILD_TESTS)

diff --git a/pugixml.spec b/pugixml.spec
index da924c96fd2671f24c4841624ff875356faccb3b..b4495cd6b7d8248e4f14932fe8b61a0f409f7b23 100644 (file)
--- a/pugixml.spec
+++ b/pugixml.spec
@@ -5,17 +5,17 @@
 Summary:       C++ XML processing library
 Summary(pl.UTF-8):     Biblioteka C++ do przetwarzania XML-a
 Name:          pugixml
-Version:       1.8
-Release:       2
+Version:       1.9
+Release:       1
 License:       MIT
 Group:         Libraries
 #Source0Download: http://pugixml.org/
 Source0:       http://github.com/zeux/pugixml/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: ffa59ee4853958e243050e6b690b4f2e
+# Source0-md5: 7286ee2ed11376b6b780ced19fae0b64
 Patch0:                longlong.patch
 Patch1:                %{name}-pc.patch
 URL:           http://pugixml.org/
-BuildRequires: cmake >= 2.6
+BuildRequires: cmake >= 2.8.12
 BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)