use %make_build %make_install %ldconfig_scriptlets

-devel: tighten dep on main pkg with %_isa
This commit is contained in:
Rex Dieter 2018-06-28 11:53:10 -05:00
parent 19ca7014c5
commit a6e107e673

View File

@ -2,7 +2,7 @@
Name: cppunit Name: cppunit
Version: 1.14.0 Version: 1.14.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: C++ unit testing framework Summary: C++ unit testing framework
# no license in files # no license in files
@ -21,7 +21,7 @@ tests.
%package devel %package devel
Summary: Libraries and headers for cppunit development Summary: Libraries and headers for cppunit development
Requires: %{name} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
This package contains the libraries and headers necessary for developing 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|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
libtool libtool
make %{?_smp_mflags}
%make_build
%install %install
make install DESTDIR=%{buildroot} INSTALL='install -p' %make_install
rm %{buildroot}%{_libdir}/*.la rm %{buildroot}%{_libdir}/*.la
# remove double of doc # remove double of doc
rm -rf %{buildroot}%{_datadir}/doc/cppunit %{buildroot}%{_datadir}/%{name}/html 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 mkdir __dist-examples-dir
mv __dist-examples __dist-examples-dir/examples mv __dist-examples __dist-examples-dir/examples
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %ldconfig_scriptlets
%files %files
%doc AUTHORS NEWS README THANKS TODO BUGS doc/FAQ %doc AUTHORS NEWS README THANKS TODO BUGS doc/FAQ
@ -84,6 +85,10 @@ mv __dist-examples __dist-examples-dir/examples
%doc doc/html %doc doc/html
%changelog %changelog
* Thu Jun 28 2018 Rex Dieter <rdieter@fedoraproject.org> - 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 <releng@fedoraproject.org> - 1.14.0-4 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild