diff --git a/.gitignore b/.gitignore index cb5feb2..f2b6eeb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pugixml-1.0.tar.gz /pugixml-1.4.tar.gz +/pugixml-1.5.tar.gz diff --git a/pugixml-1.0-set_lib_soversion.patch b/pugixml-1.0-set_lib_soversion.patch deleted file mode 100644 index 6cef85d..0000000 --- a/pugixml-1.0-set_lib_soversion.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2010-09-20 22:14:28.000000000 -0500 -+++ scripts/CMakeLists.txt 2011-07-08 13:44:29.630913408 -0500 -@@ -1,5 +1,19 @@ - project(pugixml) - -+cmake_minimum_required(VERSION 2.6) -+set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared instead of static library") -+ - set(SOURCES ../src/pugixml.hpp ../src/pugiconfig.hpp ../src/pugixml.cpp) - --add_library(pugixml STATIC ${SOURCES}) -+if(BUILD_SHARED_LIBS) -+ add_library(pugixml SHARED ${SOURCES}) -+else() -+ add_library(pugixml STATIC ${SOURCES}) -+endif() -+ -+set_target_properties(pugixml -+ PROPERTIES -+ VERSION 1.0 -+ SOVERSION 1.0 -+ ) -+ diff --git a/pugixml-export.patch b/pugixml-export.patch deleted file mode 100644 index acbccc4..0000000 --- a/pugixml-export.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up pugixml-1.4/scripts/CMakeLists.txt.export pugixml-1.4/scripts/CMakeLists.txt ---- pugixml-1.4/scripts/CMakeLists.txt.export 2014-02-22 03:25:24.000000000 -0700 -+++ pugixml-1.4/scripts/CMakeLists.txt 2014-09-03 14:02:39.535720801 -0600 -@@ -18,5 +18,6 @@ endif() - - set_target_properties(pugixml PROPERTIES VERSION 1.4 SOVERSION 1) - --install(TARGETS pugixml LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(TARGETS pugixml EXPORT pugixml-config LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${HEADERS} DESTINATION include) -+install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) diff --git a/pugixml.spec b/pugixml.spec index ad42723..c01aa8e 100644 --- a/pugixml.spec +++ b/pugixml.spec @@ -1,15 +1,16 @@ +#global prerel rc + Name: pugixml -Version: 1.4 -Release: 1%{?dist} +Version: 1.5 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A light-weight C++ XML processing library Group: Development/Libraries License: MIT URL: http://pugixml.org -Source0: http://github.com/zeux/pugixml/releases/download/v%{version}/pugixml-%{version}.tar.gz -# Add pugixml-config.cmake -# https://github.com/zeux/pugixml/pull/7 -Patch0: pugixml-export.patch +# https://github.com/zeux/pugixml/archive/v%{version}%{?prerel:%{prerel}}.tar.gz +#Source0: %{name}-%{version}%{?prerel}.tar.gz +Source0: https://github.com/zeux/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake @@ -26,34 +27,35 @@ It features: %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for package %{name} - %package doc Summary: Documentation for %{name} -Group: Documentation +Requires: %{name} = %{version}-%{release} %description doc -Documentation for package %{name} +Documentation for %{name} %prep -%setup -q -%patch0 -p1 -b .export +%setup -q -n %{name}-%{version}%{?prerel:%{prerel}} %build -mkdir -p ./build && pushd build -%cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} ../scripts -make +rm -rf build && mkdir build && pushd build +%cmake ../scripts +make %{?_smp_mflags} %install -make -C build install DESTDIR=%{buildroot} +pushd build +%make_install +popd + +# Install optional items. mkdir -p %{buildroot}%{_datadir}/%{name}/contrib install -p -m 0644 contrib/* %{buildroot}%{_datadir}/%{name}/contrib/ @@ -69,7 +71,7 @@ install -p -m 0644 contrib/* %{buildroot}%{_datadir}/%{name}/contrib/ %files devel %{_libdir}/*.so -%{_libdir}/cmake/%{name}/ +%{_libdir}/cmake/pugixml/ %{_datadir}/%{name} %{_includedir}/*.hpp @@ -78,27 +80,30 @@ install -p -m 0644 contrib/* %{buildroot}%{_datadir}/%{name}/contrib/ %changelog +* Tue Feb 3 2015 Richard Shaw - 1.5-1 +- Update to latest upstream release. + * Wed Sep 03 2014 Orion Poplawski - 1.4-1 - Update to 1.4 - Split documentation out into -doc sub-package - Add cmake export information -* Sun Aug 17 2014 Fedora Release Engineering - 1.0-8 +* Sun Aug 17 2014 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild -* Sat Jun 07 2014 Fedora Release Engineering - 1.0-7 +* Sat Jun 07 2014 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Sun Aug 04 2013 Fedora Release Engineering - 1.0-6 +* Sun Aug 04 2013 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Thu Feb 14 2013 Fedora Release Engineering - 1.0-5 +* Thu Feb 14 2013 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Sat Jul 21 2012 Fedora Release Engineering - 1.0-4 +* Sat Jul 21 2012 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Sat Jan 14 2012 Fedora Release Engineering - 1.0-3 +* Sat Jan 14 2012 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild * Thu Jan 05 2012 Richard Shaw - 1.0-2 diff --git a/sources b/sources index c1e4c0c..8e28b25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c56c91cfe3ecdee248a8e4892ef5781 pugixml-1.4.tar.gz +77a69633cc2fe0858fd177e01e95cb54 pugixml-1.5.tar.gz