From 3865c8b5df27df87db1730a0046b5c84d20e6e98 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 15 Feb 2016 14:22:15 +0100 Subject: [PATCH] Revert "drop obsolete cppunit-config" There are still packages that use it. This reverts commit 178f2e9af88cd6e9170ac9eca57b65b18cd3f8fc. --- cppunit.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cppunit.spec b/cppunit.spec index a3b55bd..a4ed760 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,15 +2,16 @@ Name: cppunit Version: 1.13.2 -Release: 2%{?dist} +Release: 1%{?dist} Summary: C++ unit testing framework # no license in files License: LGPLv2+ Url: https://www.freedesktop.org/wiki/Software/cppunit/ Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.gz -Patch0: 0001-Update-FSF-address-in-LGPL-license.patch -Patch1: 0001-convert-to-UTF-8.patch +Patch0: cppunit-1.12.0-nolibdir.patch +Patch1: 0001-Update-FSF-address-in-LGPL-license.patch +Patch2: 0001-convert-to-UTF-8.patch BuildRequires: doxygen BuildRequires: graphviz @@ -51,8 +52,9 @@ make install DESTDIR=%{buildroot} INSTALL='install -p' rm %{buildroot}%{_libdir}/*.la # remove double of doc rm -rf %{buildroot}%{_datadir}/doc/cppunit %{buildroot}%{_datadir}/%{name}/html -# remove unused cppunit-config -rm -f %{buildroot}%{_bindir}/cppunit-config %{buildroot}%{_mandir}/man1/cppunit-config.1* %{buildroot}%{_datadir}/aclocal/cppunit.m4 + +# ensure that timestamp of cppunit-config is the same for all arches +touch -c -r configure %{buildroot}%{_bindir}/cppunit-config # clean up examples rm -rf __dist-examples __dist-examples-dir @@ -76,8 +78,11 @@ mv __dist-examples __dist-examples-dir/examples %{_libdir}/libcppunit-%{apiversion}.so.0.* %files devel +%{_bindir}/cppunit-config %{_includedir}/cppunit %{_libdir}/libcppunit.so +%{_datadir}/aclocal/cppunit.m4 +%{_mandir}/man1/cppunit-config.1* %{_libdir}/pkgconfig/cppunit.pc %files doc @@ -86,9 +91,6 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog -* Sat Feb 13 2016 David Tardon - 1.13.2-2 -- drop obsolete cppunit-config - * Sat Feb 13 2016 David Tardon - 1.13.2-1 - switch to new upstream