diff --git a/.gitignore b/.gitignore
index 2d1d439..60010b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/tinyxml2-2.2.0-5321a0e.tar.gz
/tinyxml2-3.0.0-1977a72.tar.gz
/tinyxml2-6.0.0-8c8293b.tar.gz
+/tinyxml2-7.0.1.tar.gz
diff --git a/GNUInstallDirs.cmake b/GNUInstallDirs.cmake
deleted file mode 100644
index 0302e4b..0000000
--- a/GNUInstallDirs.cmake
+++ /dev/null
@@ -1,188 +0,0 @@
-# - Define GNU standard installation directories
-# Provides install directory variables as defined for GNU software:
-# http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-# Inclusion of this module defines the following variables:
-# CMAKE_INSTALL_
- destination for files of a given type
-# CMAKE_INSTALL_FULL_ - corresponding absolute path
-# where is one of:
-# BINDIR - user executables (bin)
-# SBINDIR - system admin executables (sbin)
-# LIBEXECDIR - program executables (libexec)
-# SYSCONFDIR - read-only single-machine data (etc)
-# SHAREDSTATEDIR - modifiable architecture-independent data (com)
-# LOCALSTATEDIR - modifiable single-machine data (var)
-# LIBDIR - object code libraries (lib or lib64 or lib/ on Debian)
-# INCLUDEDIR - C header files (include)
-# OLDINCLUDEDIR - C header files for non-gcc (/usr/include)
-# DATAROOTDIR - read-only architecture-independent data root (share)
-# DATADIR - read-only architecture-independent data (DATAROOTDIR)
-# INFODIR - info documentation (DATAROOTDIR/info)
-# LOCALEDIR - locale-dependent data (DATAROOTDIR/locale)
-# MANDIR - man documentation (DATAROOTDIR/man)
-# DOCDIR - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
-# Each CMAKE_INSTALL_ value may be passed to the DESTINATION options of
-# install() commands for the corresponding file type. If the includer does
-# not define a value the above-shown default will be used and the value will
-# appear in the cache for editing by the user.
-# Each CMAKE_INSTALL_FULL_ value contains an absolute path constructed
-# from the corresponding destination by prepending (if necessary) the value
-# of CMAKE_INSTALL_PREFIX.
-
-#=============================================================================
-# Copyright 2011 Nikita Krupen'ko
-# Copyright 2011 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-# Installation directories
-#
-if(NOT DEFINED CMAKE_INSTALL_BINDIR)
- set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
- set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
- set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
- set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
- set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
- set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
- set(_LIBDIR_DEFAULT "lib")
- # Override this default 'lib' with 'lib64' iff:
- # - we are on Linux system but NOT cross-compiling
- # - we are NOT on debian
- # - we are on a 64 bits system
- # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
- # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
- # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
- # See http://wiki.debian.org/Multiarch
- if(CMAKE_SYSTEM_NAME MATCHES "Linux"
- AND NOT CMAKE_CROSSCOMPILING)
- if (EXISTS "/etc/debian_version") # is this a debian system ?
- if(CMAKE_LIBRARY_ARCHITECTURE)
- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
- endif()
- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
- message(AUTHOR_WARNING
- "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
- "Please enable at least one language before including GNUInstallDirs.")
- else()
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(_LIBDIR_DEFAULT "lib64")
- endif()
- endif()
- endif()
- endif()
- set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
- set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
- set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
- set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
-endif()
-
-#-----------------------------------------------------------------------------
-# Values whose defaults are relative to DATAROOTDIR. Store empty values in
-# the cache and store the defaults in local variables if the cache values are
-# not set explicitly. This auto-updates the defaults as DATAROOTDIR changes.
-
-if(NOT CMAKE_INSTALL_DATADIR)
- set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
- set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
-endif()
-
-if(NOT CMAKE_INSTALL_INFODIR)
- set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
- set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
-endif()
-
-if(NOT CMAKE_INSTALL_LOCALEDIR)
- set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
- set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
-endif()
-
-if(NOT CMAKE_INSTALL_MANDIR)
- set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
- set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
-endif()
-
-if(NOT CMAKE_INSTALL_DOCDIR)
- set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
- set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
-endif()
-
-#-----------------------------------------------------------------------------
-
-mark_as_advanced(
- CMAKE_INSTALL_BINDIR
- CMAKE_INSTALL_SBINDIR
- CMAKE_INSTALL_LIBEXECDIR
- CMAKE_INSTALL_SYSCONFDIR
- CMAKE_INSTALL_SHAREDSTATEDIR
- CMAKE_INSTALL_LOCALSTATEDIR
- CMAKE_INSTALL_LIBDIR
- CMAKE_INSTALL_INCLUDEDIR
- CMAKE_INSTALL_OLDINCLUDEDIR
- CMAKE_INSTALL_DATAROOTDIR
- CMAKE_INSTALL_DATADIR
- CMAKE_INSTALL_INFODIR
- CMAKE_INSTALL_LOCALEDIR
- CMAKE_INSTALL_MANDIR
- CMAKE_INSTALL_DOCDIR
- )
-
-# Result directories
-#
-foreach(dir
- BINDIR
- SBINDIR
- LIBEXECDIR
- SYSCONFDIR
- SHAREDSTATEDIR
- LOCALSTATEDIR
- LIBDIR
- INCLUDEDIR
- OLDINCLUDEDIR
- DATAROOTDIR
- DATADIR
- INFODIR
- LOCALEDIR
- MANDIR
- DOCDIR
- )
- if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
- set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
- else()
- set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
- endif()
-endforeach()
diff --git a/sources b/sources
index f8fa7fd..17e06f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tinyxml2-6.0.0-8c8293b.tar.gz) = 80700958a11dc06b9a9ef37f5fad38e71a5ffb3949d94ac93cd0deb872f82242478e84d1c7196cc1a8343c9a2e943781d4bbff2aeaa660f8e3c4cf8f31226ded
+SHA512 (tinyxml2-7.0.1.tar.gz) = 623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380
diff --git a/tinyxml2-epelbuild.patch b/tinyxml2-epelbuild.patch
deleted file mode 100644
index d3b398c..0000000
--- a/tinyxml2-epelbuild.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up tinyxml2-03238517b3718f0c977bb061747faa8ebfc4fb44/CMakeLists.txt.orig tinyxml2-03238517b3718f0c977bb061747faa8ebfc4fb44/CMakeLists.txt
---- tinyxml2-03238517b3718f0c977bb061747faa8ebfc4fb44/CMakeLists.txt.orig 2013-08-05 23:04:27.000000000 +0300
-+++ tinyxml2-03238517b3718f0c977bb061747faa8ebfc4fb44/CMakeLists.txt 2013-10-14 11:17:45.403298279 +0300
-@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6 FATAL
- cmake_policy(VERSION 2.6)
-
- project(tinyxml2)
-+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
- include(GNUInstallDirs)
- #enable_testing()
-
diff --git a/tinyxml2.spec b/tinyxml2.spec
index ed8684b..5fe74a5 100644
--- a/tinyxml2.spec
+++ b/tinyxml2.spec
@@ -1,29 +1,15 @@
-# tinyml2 parses files potentially coming from untrusted sources.
-%global _hardened_build 1
-
-%global githubparent leethomason
-%global commit 8c8293ba8969a46947606a93ff0cb5a083aab47a
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20171211
-%global gitversion .%{commitdate}git%{shortcommit}
-
Name: tinyxml2
-Version: 6.0.0
-Release: 4%{?dist}
+Version: 7.0.1
+Release: 1%{?dist}
Summary: Simple, small and efficient C++ XML parser
-Group: Development/Libraries
License: zlib
-URL: https://github.com/%{githubparent}/%{name}
-Source0: https://github.com/%{githubparent}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
-
-# EPEL has a too old CMake which is missing GNUInstallDirs (copied from Fedora 19 CMake)
-Source1: GNUInstallDirs.cmake
-Patch0: tinyxml2-epelbuild.patch
+URL: https://github.com/leethomason/tinyxml2
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+BuildRequires: cmake >= 2.6
BuildRequires: gcc
BuildRequires: gcc-c++
-BuildRequires: cmake
%description
TinyXML-2 is a simple, small, efficient, C++ XML parser that can be
@@ -40,30 +26,19 @@ game. It uses less memory, is faster, and uses far fewer memory allocations.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
This package contains the libraries and header files that are needed
for writing applications with the %{name} library.
%prep
-%setup -q -n %{name}-%{commit}
+%autosetup
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} .
-%endif
-
%build
-mkdir objdir
-cd objdir
-%cmake .. -DBUILD_STATIC_LIBS=OFF
-make %{?_smp_mflags}
+%cmake . -B%{_vpath_builddir} -DBUILD_STATIC_LIBS=OFF
+%make_build -C %{_vpath_builddir}
# Library tests were disabled in 3.0.0
#%check
@@ -74,31 +49,27 @@ make %{?_smp_mflags}
# and partially re-enabled in 6.0.0
%check
-cd objdir
-make test
+%make_build test -C %{_vpath_builddir}
%install
-rm -rf %{buildroot}
-cd objdir
-make install DESTDIR=%{buildroot}
+%make_install -C %{_vpath_builddir}
%ldconfig_scriptlets
%files
%doc readme.md
-%{_libdir}/lib%{name}.so.%{version}
-%{_libdir}/lib%{name}.so.6
+%{_libdir}/lib%{name}.so.7*
%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
-
+%{_libdir}/cmake/%{name}/
%changelog
+* Tue Nov 27 2018 Igor Gnatenko - 7.0.1-1
+- Update to 7.0.1
+
* Sat Jul 14 2018 Fedora Release Engineering - 6.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild