From 3e1f084d48de7a7e3d3f934db100fb3ff1ff304b Mon Sep 17 00:00:00 2001 From: Date: Sun, 7 Apr 2019 10:34:00 +0000 Subject: [PATCH 1/9] MassBuild#1666: Increase release tag --- tinyxml2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinyxml2.spec b/tinyxml2.spec index 8fa4024..a393f6e 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -5,7 +5,7 @@ Summary: Simple, small and efficient C++ XML parser Name: tinyxml2 Version: 5.0.1 -Release: 1 +Release: 2 License: zlib Group: System/Libraries Url: http://www.grinninglizard.com/tinyxml2/ From 610ecb25f9a43aac9215afd2cba3542fc0c4ca05 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sun, 14 Apr 2019 02:47:08 +0000 Subject: [PATCH 2/9] MassBuild#1671: Increase release tag --- tinyxml2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinyxml2.spec b/tinyxml2.spec index a393f6e..d829d86 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -5,7 +5,7 @@ Summary: Simple, small and efficient C++ XML parser Name: tinyxml2 Version: 5.0.1 -Release: 2 +Release: 3 License: zlib Group: System/Libraries Url: http://www.grinninglizard.com/tinyxml2/ From 98af437936ffa12fab7053341d024ce797da2ab9 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Sat, 4 Jan 2020 09:14:08 +0300 Subject: [PATCH 3/9] bot: rpm5 -> rpm4 (1) --- tinyxml2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinyxml2.spec b/tinyxml2.spec index d829d86..41af23f 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -79,7 +79,7 @@ cd .. doxygen dox %install -%makeinstall_std -C build +%make_install -C build # Install CMake find module install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindTinyXML2.cmake From 17ea95ab1920d5b99197f0fe7598c7f5a1efba03 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Sun, 5 Jan 2020 02:57:22 +0300 Subject: [PATCH 4/9] bot: rpm5 -> rpm4 (3) --- tinyxml2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinyxml2.spec b/tinyxml2.spec index 41af23f..404bfad 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -72,7 +72,7 @@ for writing applications with the %{name} library. %build %cmake -%make +%make_build # Build the documentation from the "dox" template cd .. From 1e6836bf4442378504d5675faf21e537d39b26e7 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Mon, 6 Jan 2020 12:44:15 +0300 Subject: [PATCH 5/9] bot: rpm5 -> rpm4 (6) --- tinyxml2.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/tinyxml2.spec b/tinyxml2.spec index 404bfad..f95274b 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -89,4 +89,3 @@ pushd build export LD_LIBRARY_PATH=`pwd` ./xmltest popd - From ab997be32b08112d11016611597700af7403e501 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Mon, 13 Jan 2020 19:21:16 +0300 Subject: [PATCH 6/9] bot: rpm5 -> rpm4 (8) --- tinyxml2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tinyxml2.spec b/tinyxml2.spec index f95274b..c5e974c 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -72,14 +72,14 @@ for writing applications with the %{name} library. %build %cmake -%make_build +%make # Build the documentation from the "dox" template cd .. doxygen dox %install -%make_install -C build +%makeinstall_std -C build # Install CMake find module install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindTinyXML2.cmake From 2aac4d6a0ada37011f69ee541a18778f014330d7 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Wed, 4 Mar 2020 11:08:24 +0300 Subject: [PATCH 7/9] Updated to 6.2.0 --- .abf.yml | 4 ++- ...Make-Respect-libdir-for-config-files.patch | 26 ------------------- tinyxml2.spec | 9 +++---- 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 0001-CMake-Respect-libdir-for-config-files.patch diff --git a/.abf.yml b/.abf.yml index 87513b2..48dc304 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,4 @@ -sources: +removed_sources: tinyxml2-5.0.1.tar.gz: b9b5569343f5829345b1bdfe5d0c08c079286495 +sources: + tinyxml2-6.2.0.tar.gz: ea262a19ea324c7e5ef6acd8025fdb6e64ab9ecd diff --git a/0001-CMake-Respect-libdir-for-config-files.patch b/0001-CMake-Respect-libdir-for-config-files.patch deleted file mode 100644 index 730e5fd..0000000 --- a/0001-CMake-Respect-libdir-for-config-files.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f209bf66420c4149bb088bfb3d08f2ad845a5b5c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= -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 - diff --git a/tinyxml2.spec b/tinyxml2.spec index c5e974c..27dea31 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -1,18 +1,16 @@ -%define major 5 +%define major 6 %define libname %mklibname %{name} _%{major} %define devname %mklibname %{name} -d Summary: Simple, small and efficient C++ XML parser Name: tinyxml2 -Version: 5.0.1 -Release: 3 +Version: 6.2.0 +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 @@ -68,7 +66,6 @@ for writing applications with the %{name} library. %prep %setup -q -%patch0 -p1 %build %cmake From cceb351b10f9502aef8a5c316bb0265bde39f6fc Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 7 Mar 2023 16:48:32 +1000 Subject: [PATCH 8/9] New version 9.0.0 New library major 9 --- .abf.yml | 4 +--- tinyxml2.spec | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.abf.yml b/.abf.yml index 48dc304..b122ce0 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,2 @@ -removed_sources: - tinyxml2-5.0.1.tar.gz: b9b5569343f5829345b1bdfe5d0c08c079286495 sources: - tinyxml2-6.2.0.tar.gz: ea262a19ea324c7e5ef6acd8025fdb6e64ab9ecd + tinyxml2-9.0.0.tar.gz: c3a0ba1e5e81f4297d3a796c397682ae3eeb8e89 diff --git a/tinyxml2.spec b/tinyxml2.spec index 27dea31..4207277 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -1,10 +1,10 @@ -%define major 6 +%define major 9 %define libname %mklibname %{name} _%{major} %define devname %mklibname %{name} -d Summary: Simple, small and efficient C++ XML parser Name: tinyxml2 -Version: 6.2.0 +Version: 9.0.0 Release: 1 License: zlib Group: System/Libraries @@ -84,5 +84,5 @@ install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindTinyXML2.c %check pushd build export LD_LIBRARY_PATH=`pwd` -./xmltest +./xmltest .././resources/ popd From b94f4cd9405ce990d0ab7c2ae072f42515c83007 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Tue, 6 Feb 2024 14:53:32 +0000 Subject: [PATCH 9/9] 10.0.0 --- .abf.yml | 2 +- tinyxml2.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.abf.yml b/.abf.yml index b122ce0..078abc8 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - tinyxml2-9.0.0.tar.gz: c3a0ba1e5e81f4297d3a796c397682ae3eeb8e89 + tinyxml2-10.0.0.tar.gz: c9030c4bfa0f7cd5ea3a6669f8bf038a2ffcdfed diff --git a/tinyxml2.spec b/tinyxml2.spec index 4207277..7c06845 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -1,10 +1,10 @@ -%define major 9 +%define major 10 %define libname %mklibname %{name} _%{major} %define devname %mklibname %{name} -d Summary: Simple, small and efficient C++ XML parser Name: tinyxml2 -Version: 9.0.0 +Version: 10.0.0 Release: 1 License: zlib Group: System/Libraries