From 380952b3bbe30a29827c1ce5067c9f4178d6351c73acf0f69fc271ef81434bd6 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 28 Dec 2017 09:53:06 +0000 Subject: [PATCH 1/2] Accepting request 560107 from home:posophe:branches:devel:libraries:c_c++ - Update to version 6.0.0 + No changelog available Please review OBS-URL: https://build.opensuse.org/request/show/560107 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tinyxml2?expand=0&rev=7 --- tinyxml2-3.0.0.tar.gz | 3 --- tinyxml2-6.0.0.tar.gz | 3 +++ tinyxml2.changes | 6 ++++++ tinyxml2.spec | 13 +++++++++---- 4 files changed, 18 insertions(+), 7 deletions(-) delete mode 100644 tinyxml2-3.0.0.tar.gz create mode 100644 tinyxml2-6.0.0.tar.gz diff --git a/tinyxml2-3.0.0.tar.gz b/tinyxml2-3.0.0.tar.gz deleted file mode 100644 index c706a0d..0000000 --- a/tinyxml2-3.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:128aa1553e88403833e0cccf1b651f45ce87bc207871f53fdcc8e7f9ec795747 -size 339620 diff --git a/tinyxml2-6.0.0.tar.gz b/tinyxml2-6.0.0.tar.gz new file mode 100644 index 0000000..9ae47c5 --- /dev/null +++ b/tinyxml2-6.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9444ba6322267110b4aca61cbe37d5dcab040344b5c97d0b36c119aa61319b0f +size 576612 diff --git a/tinyxml2.changes b/tinyxml2.changes index 332a0ed..0732bd2 100644 --- a/tinyxml2.changes +++ b/tinyxml2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 25 21:08:55 UTC 2017 - p.drouand@gmail.com + +- Update to version 6.0.0 + + No changelog available + ------------------------------------------------------------------- Tue Jul 12 07:50:05 UTC 2016 - mpluskal@suse.com diff --git a/tinyxml2.spec b/tinyxml2.spec index 8f37aff..a656e4e 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -1,7 +1,7 @@ # # spec file for package tinyxml2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,10 @@ # -%define so_version 3 +%define so_version 6 %define lib_package lib%{name}-%{so_version} Name: tinyxml2 -Version: 3.0.0 +Version: 6.0.0 Release: 0 Summary: A simple, small, C++ XML parser License: Zlib @@ -29,7 +29,6 @@ Source: https://github.com/leethomason/tinyxml2/archive/%{version}.tar.g BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description TinyXML is a simple, small, C++ XML parser that can be easily integrating @@ -70,6 +69,11 @@ make %{?_smp_mflags} %install %cmake_install find %{buildroot} -type f -name "*.la" -delete -print +# /usr/lib/cmake is not owned by cmake; avoid any further conflicts +if [ ! -d "%{buildroot}/%{_libdir}/cmake/%{name}" ]; then +mkdir -p %{buildroot}/%{_libdir}/cmake/%{name} +mv %{buildroot}%{_libexecdir}/cmake/tinyxml2 %{buildroot}/%{_libdir}/cmake/%{name} +fi %check make %{?_smp_mflags} test @@ -87,5 +91,6 @@ make %{?_smp_mflags} test %{_includedir}/tinyxml2.h %{_libdir}/libtinyxml2.so %{_libdir}/pkgconfig/tinyxml2.pc +%{_libdir}/cmake/tinyxml2 %changelog From 536894eb2ea87d2582a39d0e43f10bbd806cff70b36e77e644259b9be9e42f5b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 3 Jan 2018 10:16:42 +0000 Subject: [PATCH 2/2] Accepting request 560473 from home:jengelh:branches:devel:libraries:c_c++ - Remove rhetoric write style from description. Expand description on the features/limits of tinyxml. OBS-URL: https://build.opensuse.org/request/show/560473 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tinyxml2?expand=0&rev=8 --- tinyxml2.changes | 6 ++++++ tinyxml2.spec | 26 ++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/tinyxml2.changes b/tinyxml2.changes index 0732bd2..c81e389 100644 --- a/tinyxml2.changes +++ b/tinyxml2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 29 00:53:20 UTC 2017 - jengelh@inai.de + +- Remove rhetoric write style from description. + Expand description on the features/limits of tinyxml. + ------------------------------------------------------------------- Mon Dec 25 21:08:55 UTC 2017 - p.drouand@gmail.com diff --git a/tinyxml2.spec b/tinyxml2.spec index a656e4e..b7c3740 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -21,7 +21,7 @@ Name: tinyxml2 Version: 6.0.0 Release: 0 -Summary: A simple, small, C++ XML parser +Summary: Basic XML parser in C++ License: Zlib Group: Development/Libraries/C and C++ Url: https://github.com/leethomason/tinyxml2 @@ -31,23 +31,25 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig %description -TinyXML is a simple, small, C++ XML parser that can be easily integrating -into other programs. Have you ever found yourself writing a text file parser -every time you needed to save human readable data or serialize objects? -TinyXML solves the text I/O file once and for all. -(Or, as a friend said, ends the Just Another Text File Parser problem.) +TinyXML is a feature-bounded XML parser in C++ that can be integrated +into other programs. + +TinyXML-2 does not parse or use DTDs (Document Type Definitions) or +XSLs (eXtensible Stylesheet Language). There are other parsers (with +different footprints) to do such. %package -n %{lib_package} -Summary: A simple, small, C++ XML parser +Summary: Basic XML parser in C++ License: Zlib Group: System/Libraries %description -n %{lib_package} -TinyXML is a simple, small, C++ XML parser that can be easily integrating -into other programs. Have you ever found yourself writing a text file parser -every time you needed to save human readable data or serialize objects? -TinyXML solves the text I/O file once and for all. -(Or, as a friend said, ends the Just Another Text File Parser problem.) +TinyXML is a feature-bounded XML parser in C++ that can be integrated +into other programs. + +TinyXML-2 does not parse or use DTDs (Document Type Definitions) or +XSLs (eXtensible Stylesheet Language). There are other parsers (with +different footprints) to do such. %package devel Summary: Development files for libtinyxml2