From 8dc4d97b2658c4c541fa2529a68d54af3d922b819ee5228d805368c61575ee1b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 15 May 2020 07:03:48 +0000 Subject: [PATCH] Accepting request 800976 from home:pgajdos:libexec - %{_libexecdir} is now /usr/libexec, so do not use it where /usr/lib is intended OBS-URL: https://build.opensuse.org/request/show/800976 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tinyxml2?expand=0&rev=10 --- tinyxml2.changes | 6 ++++++ tinyxml2.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tinyxml2.changes b/tinyxml2.changes index c81e389..bab30a6 100644 --- a/tinyxml2.changes +++ b/tinyxml2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 7 08:08:04 UTC 2020 - pgajdos@suse.com + +- %{_libexecdir} is now /usr/libexec, so do not use it where + /usr/lib is intended + ------------------------------------------------------------------- Fri Dec 29 00:53:20 UTC 2017 - jengelh@inai.de diff --git a/tinyxml2.spec b/tinyxml2.spec index b7c3740..efe8ace 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -1,7 +1,7 @@ # # spec file for package tinyxml2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,7 @@ Release: 0 Summary: Basic XML parser in C++ License: Zlib Group: Development/Libraries/C and C++ -Url: https://github.com/leethomason/tinyxml2 +URL: https://github.com/leethomason/tinyxml2 Source: https://github.com/leethomason/tinyxml2/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: gcc-c++ @@ -53,7 +53,7 @@ different footprints) to do such. %package devel Summary: Development files for libtinyxml2 -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{lib_package} = %{version} @@ -74,7 +74,7 @@ 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} +mv %{buildroot}/usr/lib/cmake/tinyxml2 %{buildroot}/%{_libdir}/cmake/tinyxml2 fi %check