From 3600750a8f1b0eaa6cab346496fd75a07ea749cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@fedoraproject.org>
Date: Tue, 23 Jan 2018 00:23:25 +0100
Subject: [PATCH] Update to 6.0.0

---
 .gitignore    |  1 +
 sources       |  2 +-
 tinyxml2.spec | 26 +++++++++++++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 86165f2..2d1d439 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /tinyxml2-2.1.0-6ee53e7.tar.gz
 /tinyxml2-2.2.0-5321a0e.tar.gz
 /tinyxml2-3.0.0-1977a72.tar.gz
+/tinyxml2-6.0.0-8c8293b.tar.gz
diff --git a/sources b/sources
index c363238..f8fa7fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3953aa7d5dda966873e97714b1f5c59d  tinyxml2-3.0.0-1977a72.tar.gz
+SHA512 (tinyxml2-6.0.0-8c8293b.tar.gz) = 80700958a11dc06b9a9ef37f5fad38e71a5ffb3949d94ac93cd0deb872f82242478e84d1c7196cc1a8343c9a2e943781d4bbff2aeaa660f8e3c4cf8f31226ded
diff --git a/tinyxml2.spec b/tinyxml2.spec
index 27981ba..3205ff8 100644
--- a/tinyxml2.spec
+++ b/tinyxml2.spec
@@ -2,14 +2,14 @@
 %global         _hardened_build 1
 
 %global         githubparent    leethomason
-%global         commit          1977a7258cc66fd4da7f1e9da05a4933646a7803
+%global         commit          8c8293ba8969a46947606a93ff0cb5a083aab47a
 %global         shortcommit     %(c=%{commit}; echo ${c:0:7})
-%global         commitdate      20140914
+%global         commitdate      20171211
 %global         gitversion      .%{commitdate}git%{shortcommit}
 
 Name:           tinyxml2
-Version:        3.0.0
-Release:        4%{?dist}
+Version:        6.0.0
+Release:        1%{?dist}
 Summary:        Simple, small and efficient C++ XML parser
 
 Group:          Development/Libraries
@@ -49,6 +49,10 @@ for writing applications with the %{name} library.
 %prep
 %setup -q -n %{name}-%{commit}
 chmod -c -x *.cpp *.h
+
+# temporary fix for https://github.com/leethomason/tinyxml2/pull/653
+sed -i -e 's,lib/,${CMAKE_INSTALL_LIBDIR}/,g' CMakeLists.txt
+
 %if 0%{?rhel} == 5 || 0%{?rhel} == 6
 %patch0 -p1 -b .epel
 cp -p %{SOURCE1} .
@@ -67,6 +71,11 @@ make %{?_smp_mflags}
 #export LD_LIBRARY_PATH=`pwd`
 #./test
 
+# and partially re-enabled in 6.0.0
+%check
+cd objdir
+make test
+
 %install
 rm -rf %{buildroot}
 cd objdir
@@ -82,14 +91,21 @@ rm -rf %{buildroot}
 %files
 %doc readme.md
 %{_libdir}/lib%{name}.so.%{version}
-%{_libdir}/lib%{name}.so.3
+%{_libdir}/lib%{name}.so.6
 
 %files devel
 %{_includedir}/%{name}.h
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/cmake/%{name}/tinyxml2Config.cmake
+%{_libdir}/cmake/%{name}/tinyxml2Targets-noconfig.cmake
+%{_libdir}/cmake/%{name}/tinyxml2Targets.cmake
+
 
 %changelog
+* Mon Jan 22 2018 François Cami <fcami@fedoraproject.org> - 6.0.0-1
+- Update to latest upstream (rhbz#1357711)
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild