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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:128aa1553e88403833e0cccf1b651f45ce87bc207871f53fdcc8e7f9ec795747
-size 339620

tinyxml2-6.0.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9444ba6322267110b4aca61cbe37d5dcab040344b5c97d0b36c119aa61319b0f
+size 576612

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
 

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