Update to latest upstream release.

epel9
Richard M. Shaw 10 years ago
parent d3919962dc
commit 990998bc40

1
.gitignore vendored

@ -1,2 +1,3 @@
/pugixml-1.0.tar.gz /pugixml-1.0.tar.gz
/pugixml-1.4.tar.gz /pugixml-1.4.tar.gz
/pugixml-1.5.tar.gz

@ -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
+ )
+

@ -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)

@ -1,15 +1,16 @@
#global prerel rc
Name: pugixml Name: pugixml
Version: 1.4 Version: 1.5
Release: 1%{?dist} Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A light-weight C++ XML processing library Summary: A light-weight C++ XML processing library
Group: Development/Libraries Group: Development/Libraries
License: MIT License: MIT
URL: http://pugixml.org URL: http://pugixml.org
Source0: http://github.com/zeux/pugixml/releases/download/v%{version}/pugixml-%{version}.tar.gz # https://github.com/zeux/pugixml/archive/v%{version}%{?prerel:%{prerel}}.tar.gz
# Add pugixml-config.cmake #Source0: %{name}-%{version}%{?prerel}.tar.gz
# https://github.com/zeux/pugixml/pull/7 Source0: https://github.com/zeux/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Patch0: pugixml-export.patch
BuildRequires: cmake BuildRequires: cmake
@ -26,34 +27,35 @@ It features:
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
Development files for package %{name} Development files for package %{name}
%package doc %package doc
Summary: Documentation for %{name} Summary: Documentation for %{name}
Group: Documentation Requires: %{name} = %{version}-%{release}
%description doc %description doc
Documentation for package %{name} Documentation for %{name}
%prep %prep
%setup -q %setup -q -n %{name}-%{version}%{?prerel:%{prerel}}
%patch0 -p1 -b .export
%build %build
mkdir -p ./build && pushd build rm -rf build && mkdir build && pushd build
%cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} ../scripts %cmake ../scripts
make make %{?_smp_mflags}
%install %install
make -C build install DESTDIR=%{buildroot} pushd build
%make_install
popd
# Install optional items.
mkdir -p %{buildroot}%{_datadir}/%{name}/contrib mkdir -p %{buildroot}%{_datadir}/%{name}/contrib
install -p -m 0644 contrib/* %{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 %files devel
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/cmake/%{name}/ %{_libdir}/cmake/pugixml/
%{_datadir}/%{name} %{_datadir}/%{name}
%{_includedir}/*.hpp %{_includedir}/*.hpp
@ -78,27 +80,30 @@ install -p -m 0644 contrib/* %{buildroot}%{_datadir}/%{name}/contrib/
%changelog %changelog
* Tue Feb 3 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5-1
- Update to latest upstream release.
* Wed Sep 03 2014 Orion Poplawski <orion@cora.nwra.com> - 1.4-1 * Wed Sep 03 2014 Orion Poplawski <orion@cora.nwra.com> - 1.4-1
- Update to 1.4 - Update to 1.4
- Split documentation out into -doc sub-package - Split documentation out into -doc sub-package
- Add cmake export information - Add cmake export information
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-8 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-7 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-6 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-5 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-3 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Thu Jan 05 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0-2 * Thu Jan 05 2012 Richard Shaw <hobbes1069@gmail.com> - 1.0-2

@ -1 +1 @@
7c56c91cfe3ecdee248a8e4892ef5781 pugixml-1.4.tar.gz 77a69633cc2fe0858fd177e01e95cb54 pugixml-1.5.tar.gz

Loading…
Cancel
Save