From 44de9b2aba3be604b2e881fdd4a989187ac8d5fa Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 26 Oct 2018 04:04:54 +0000 Subject: [PATCH] update to address https://bugzilla.redhat.com/show_bug.cgi?id=1638768#c6 * %{_datarootdir} -> %{_datadir} * %{_libdir}/libfmt.so.5* instead of %{_libdir}/libfmt.so* * use %ldconfig_scriptlets macro instead of calling /sbin/ldconfig * use tar.gz not zip Signed-off-by: Kefu Chai --- fmt.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/fmt.spec b/fmt.spec index a7855b0..85acbd3 100644 --- a/fmt.spec +++ b/fmt.spec @@ -77,7 +77,7 @@ pushd build %endif -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DFMT_CMAKE_DIR=%{_datarootdir}/cmake/%{name} \ + -DFMT_CMAKE_DIR=%{_datadir}/cmake/%{name} \ -DFMT_LIB_DIR=%{_libdir} # Remove --clean-css since that plugin isn't available @@ -89,13 +89,15 @@ rm -rf ../build/doc/html/{.buildinfo,.doctrees,objects.inv} %install %make_install -C build +%ldconfig_scriptlets + %check pushd build ctest -VV %{?_smp_mflags} popd %files -%{_libdir}/libfmt.so.* +%{_libdir}/libfmt.so.5* %{!?_licensedir:%global license %%doc} %license LICENSE.rst %doc ChangeLog.rst README.rst @@ -103,16 +105,12 @@ popd %files devel %{_includedir}/fmt/ %{_libdir}/libfmt.so -%{_datarootdir}/cmake/fmt/ +%{_datadir}/cmake/fmt/ %files doc %doc %{_datadir}/doc/fmt/ %license doc/python-license.txt -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - %changelog * Thu Oct 11 2018 Kefu Chai - 5.2.1-1 - Update to 5.2.1