mirror of
https://abf.rosa.ru/djam/tinyxml2.git
synced 2025-02-23 17:02:56 +00:00
New version 5.0.1
New library major 5
This commit is contained in:
Andrey Bondrov
parent
11c05ca84e
commit
ba2963dbfa
3 changed files with 60 additions and 34 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
tinyxml2-3.0.0.tar.gz: 07acaae49f7dd3dab790da4fe72d0c7ef0d116d1
|
||||
tinyxml2-5.0.1.tar.gz: b9b5569343f5829345b1bdfe5d0c08c079286495
|
||||
|
|
|
|||
26
0001-CMake-Respect-libdir-for-config-files.patch
Normal file
26
0001-CMake-Respect-libdir-for-config-files.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
From f209bf66420c4149bb088bfb3d08f2ad845a5b5c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
|
||||
Date: Mon, 17 Jul 2017 15:50:34 +0200
|
||||
Subject: [PATCH] CMake: Respect libdir for config files
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cec4470..c647477 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -170,7 +170,7 @@ file(WRITE
|
||||
|
||||
install(FILES
|
||||
${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
|
||||
- DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
|
||||
|
||||
install(EXPORT ${CMAKE_PROJECT_NAME}Targets
|
||||
- DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
|
||||
--
|
||||
2.13.2
|
||||
|
||||
|
|
@ -1,20 +1,20 @@
|
|||
%define major 3
|
||||
%define major 5
|
||||
%define libname %mklibname %{name} _%{major}
|
||||
%define devname %mklibname %{name} -d
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: tinyxml2
|
||||
Version: 3.0.0
|
||||
Release: 3
|
||||
Summary: Simple, small and efficient C++ XML parser
|
||||
Group: System/Libraries
|
||||
License: zlib
|
||||
URL: http://www.grinninglizard.com/tinyxml2/
|
||||
Source0: https://github.com/leethomason/tinyxml2/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: FindTinyXML2.cmake
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: doxygen
|
||||
Summary: Simple, small and efficient C++ XML parser
|
||||
Name: tinyxml2
|
||||
Version: 5.0.1
|
||||
Release: 1
|
||||
License: zlib
|
||||
Group: System/Libraries
|
||||
Url: http://www.grinninglizard.com/tinyxml2/
|
||||
Source0: https://github.com/leethomason/tinyxml2/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: FindTinyXML2.cmake
|
||||
# https://github.com/leethomason/tinyxml2/pull/587
|
||||
Patch0: 0001-CMake-Respect-libdir-for-config-files.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: doxygen
|
||||
|
||||
%description
|
||||
TinyXML-2 is a simple, small, efficient, C++ XML parser that can be
|
||||
|
|
@ -22,11 +22,11 @@ easily integrated into other programs. It uses a Document Object Model
|
|||
(DOM), meaning the XML data is parsed into a C++ objects that can be
|
||||
browsed and manipulated, and then written to disk or another output stream.
|
||||
|
||||
#------------------------------------------------------------------
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package -n %{libname}
|
||||
Summary: Simple, small and efficient C++ XML parser
|
||||
Group: System/Libraries
|
||||
%package -n %{libname}
|
||||
Summary: Simple, small and efficient C++ XML parser
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{libname}
|
||||
TinyXML-2 is a simple, small, efficient, C++ XML parser that can be
|
||||
|
|
@ -41,17 +41,16 @@ TinyXML-2 uses a similar API to TinyXML-1, But the implementation of the
|
|||
parser was completely re-written to make it more appropriate for use in a
|
||||
game. It uses less memory, is faster, and uses far fewer memory allocations.
|
||||
|
||||
%files -n %{libname}
|
||||
%doc readme.md
|
||||
%files -n %{libname}
|
||||
%{_libdir}/lib%{name}.so.%{major}
|
||||
%{_libdir}/lib%{name}.so.%{version}
|
||||
|
||||
#------------------------------------------------------------------
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package -n %{devname}
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/C++
|
||||
Requires: %{libname} = %{EVRD}
|
||||
%package -n %{devname}
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/C++
|
||||
Requires: %{libname} = %{EVRD}
|
||||
|
||||
%description -n %{devname}
|
||||
This package contains the libraries and header files that are needed
|
||||
|
|
@ -61,13 +60,15 @@ for writing applications with the %{name} library.
|
|||
%doc readme.md docs/*
|
||||
%{_datadir}/cmake/Modules/FindTinyXML2.cmake
|
||||
%{_includedir}/%{name}.h
|
||||
%{_libdir}/cmake/%{name}/
|
||||
%{_libdir}/lib%{name}.so
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
|
||||
#------------------------------------------------------------------
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%cmake
|
||||
|
|
@ -77,16 +78,15 @@ for writing applications with the %{name} library.
|
|||
cd ..
|
||||
doxygen dox
|
||||
|
||||
%install
|
||||
%makeinstall_std -C build
|
||||
|
||||
# Install CMake find module
|
||||
install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindTinyXML2.cmake
|
||||
|
||||
%check
|
||||
pushd build
|
||||
export LD_LIBRARY_PATH=`pwd`
|
||||
./xmltest
|
||||
popd
|
||||
|
||||
%install
|
||||
%makeinstall_std -C build
|
||||
|
||||
# Install CMake find module
|
||||
install -D -m644 %{SOURCE1} \
|
||||
%{buildroot}%{_datadir}/cmake/Modules/FindTinyXML2.cmake
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue