[packages/pugixml] - updated to 1.10 - removed obsolete pc patch

qboosh qboosh at pld-linux.org
Sun Dec 15 21:07:39 CET 2019


commit f109191a084d81cf50006c23211f7f953af0a316
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 15 21:08:16 2019 +0100

    - updated to 1.10
    - removed obsolete pc patch

 pugixml-pc.patch | 35 -----------------------------------
 pugixml.spec     |  7 ++-----
 2 files changed, 2 insertions(+), 40 deletions(-)
---
diff --git a/pugixml.spec b/pugixml.spec
index b4495cd..5cc2402 100644
--- a/pugixml.spec
+++ b/pugixml.spec
@@ -5,15 +5,14 @@
 Summary:	C++ XML processing library
 Summary(pl.UTF-8):	Biblioteka C++ do przetwarzania XML-a
 Name:		pugixml
-Version:	1.9
+Version:	1.10
 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:	7286ee2ed11376b6b780ced19fae0b64
+# Source0-md5:	f97237e9908201c6d8536210747b66af
 Patch0:		longlong.patch
-Patch1:		%{name}-pc.patch
 URL:		http://pugixml.org/
 BuildRequires:	cmake >= 2.8.12
 BuildRequires:	libstdc++-devel
@@ -66,13 +65,11 @@ Statyczna biblioteka pugixml.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 install -d build
 cd build
 %cmake .. \
-	-DBUILD_PKGCONFIG=ON \
 	-DBUILD_SHARED_LIBS=ON
 cd ..
 
diff --git a/pugixml-pc.patch b/pugixml-pc.patch
deleted file mode 100644
index 522d414..0000000
--- a/pugixml-pc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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)
--	# Install library into its own directory under LIBDIR
--	set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
--endif()
--
- 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_LIBDIR}/pkgconfig)
- endif()
- 
- if(BUILD_TESTS)
---- pugixml-1.8/scripts/pugixml.pc.in.orig	1970-01-01 01:00:00.000000000 +0100
-+++ pugixml-1.8/scripts/pugixml.pc.in	2017-02-25 14:44:49.164006784 +0100
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--includedir=${prefix}/include/pugixml- at PUGIXML_VERSION_STRING@
--libdir=${exec_prefix}/lib/pugixml- at PUGIXML_VERSION_STRING@
-+includedir=${prefix}/include
-+libdir=@CMAKE_INSTALL_LIBDIR@
- 
- Name: pugixml
- Description: Light-weight, simple and fast XML parser for C++ with XPath support.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pugixml.git/commitdiff/f109191a084d81cf50006c23211f7f953af0a316



More information about the pld-cvs-commit mailing list