From c2c1cd1828e5459e9adf1fcec46923e5c2b5ec861ab3d5d1fef73067ef80b871 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Tue, 7 Apr 2015 13:06:57 +0000 Subject: [PATCH] Accepting request 294738 from home:jengelh:branches:devel:libraries:c_c++ - Require pkg-config for pkgconfig() symbols to be generated. - Drop suggestion for non-existant %name-docs subpackage. OBS-URL: https://build.opensuse.org/request/show/294738 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tinyxml2?expand=0&rev=3 --- tinyxml2.changes | 6 ++++++ tinyxml2.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tinyxml2.changes b/tinyxml2.changes index 40a1f22..07cc89c 100644 --- a/tinyxml2.changes +++ b/tinyxml2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 7 12:04:37 UTC 2015 - jengelh@inai.de + +- Require pkg-config for pkgconfig() symbols to be generated. +- Drop suggestion for non-existant %name-docs subpackage. + ------------------------------------------------------------------- Mon Apr 6 23:51:42 UTC 2015 - p.drouand@gmail.com diff --git a/tinyxml2.spec b/tinyxml2.spec index 409c80c..928e4ea 100644 --- a/tinyxml2.spec +++ b/tinyxml2.spec @@ -24,7 +24,7 @@ Release: 0 %define lib_package lib%{name}-%{so_version} Summary: A simple, small, C++ XML parser License: Zlib -Group: System/Libraries +Group: Development/Libraries/C and C++ Source: https://github.com/leethomason/tinyxml2/archive/%{version}.tar.gz Url: https://github.com/leethomason/tinyxml2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,6 +32,7 @@ BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: libtool +BuildRequires: pkg-config %description TinyXML is a simple, small, C++ XML parser that can be easily integrating @@ -57,7 +58,6 @@ Summary: Development files for libtinyxml2 License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: %{lib_package} = %{version} -Suggests: %{name}-%{docs} %description devel Contains libraries and header files for @@ -72,7 +72,7 @@ make %{?_smp_mflags} %install cd build -%makeinstall +%make_install rm -f %{buildroot}%{_libdir}/*.la %post -n %{lib_package} -p /sbin/ldconfig @@ -80,12 +80,12 @@ rm -f %{buildroot}%{_libdir}/*.la %postun -n %{lib_package} -p /sbin/ldconfig %files -n %{lib_package} -%defattr(-,root,root,-) +%defattr(-,root,root) %doc readme.md %{_libdir}/*.so.* %files devel -%defattr(-,root,root,-) +%defattr(-,root,root) %{_includedir}/* %{_libdir}/pkgconfig/tinyxml2.pc %{_libdir}/*.so