From a6e107e673077583432cfedd5244360de4e901a9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 28 Jun 2018 11:53:10 -0500 Subject: [PATCH] use %make_build %make_install %ldconfig_scriptlets -devel: tighten dep on main pkg with %_isa --- cppunit.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cppunit.spec b/cppunit.spec index b2cb917..46cc0e6 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -2,7 +2,7 @@ Name: cppunit Version: 1.14.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ unit testing framework # no license in files @@ -21,7 +21,7 @@ tests. %package devel Summary: Libraries and headers for cppunit development -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains the libraries and headers necessary for developing @@ -43,10 +43,12 @@ sed -i \ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ libtool -make %{?_smp_mflags} + +%make_build %install -make install DESTDIR=%{buildroot} INSTALL='install -p' +%make_install + rm %{buildroot}%{_libdir}/*.la # remove double of doc rm -rf %{buildroot}%{_datadir}/doc/cppunit %{buildroot}%{_datadir}/%{name}/html @@ -62,9 +64,8 @@ find __dist-examples \( -name Makefile.in -o -name .cvsignore -o -name '*.dsw' - mkdir __dist-examples-dir mv __dist-examples __dist-examples-dir/examples -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc AUTHORS NEWS README THANKS TODO BUGS doc/FAQ @@ -84,6 +85,10 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Thu Jun 28 2018 Rex Dieter - 1.14.0-5 +- use %%make_build %%make_install %%ldconfig_scriptlets +- -devel: tighten dep on main pkg with %%_isa + * Wed Feb 07 2018 Fedora Release Engineering - 1.14.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild