From d3193b83c49400f8e7ded5f38c9f2b8958c77e92 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 13 Nov 2012 17:43:13 +0100 Subject: [PATCH] Call ldconfig in %%post/%%postun of -libs subpackage, Move .so links to -devel subpackage --- tog-pegasus.spec | 51 +++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/tog-pegasus.spec b/tog-pegasus.spec index e271a2f..91e6019 100644 --- a/tog-pegasus.spec +++ b/tog-pegasus.spec @@ -8,7 +8,7 @@ Name: tog-pegasus Version: %{major_ver}.0 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 2 Summary: OpenPegasus WBEM Services for Linux @@ -316,10 +316,15 @@ popd /usr/share/Pegasus/samples /usr/include/Pegasus /usr/share/Pegasus/html +%{_libdir}/*.so +%{_libdir}/Pegasus/providerManagers/*.so +%{_libdir}/Pegasus/providers/*.so %files libs %defattr(0755, root, pegasus, 0750) -%{_libdir}/* +%{_libdir}/*.so.* +%{_libdir}/Pegasus/providerManagers/*.so.* +%{_libdir}/Pegasus/providers/*.so.* %exclude /usr/lib/debug %if %{PEGASUS_BUILD_TEST_RPM} @@ -391,22 +396,7 @@ fi /sbin/ldconfig %systemd_postun_with_restart tog-pegasus.service -%preun devel -if [ $1 -eq 0 ] ; then - make --directory /usr/share/Pegasus/samples -s clean >/dev/null 2>&1 || :; -fi -:; - -%pre libs -if [ $1 -eq 1 ]; then -# first install: create the 'pegasus' user and group: - /usr/sbin/groupadd -g %{pegasus_gid} -f -r pegasus >/dev/null 2>&1 || :; - /usr/sbin/useradd -u %{pegasus_uid} -r -N -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \ - -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :; -fi -:; - -%post libs +%post devel if [ $1 -eq 1 ]; then # Create Symbolic Links for SDK Libraries # @@ -442,8 +432,33 @@ if [ $1 -eq 1 ]; then fi :; +%preun devel +if [ $1 -eq 0 ] ; then + make --directory /usr/share/Pegasus/samples -s clean >/dev/null 2>&1 || :; +fi +:; + +%pre libs +if [ $1 -eq 1 ]; then +# first install: create the 'pegasus' user and group: + /usr/sbin/groupadd -g %{pegasus_gid} -f -r pegasus >/dev/null 2>&1 || :; + /usr/sbin/useradd -u %{pegasus_uid} -r -N -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \ + -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :; +fi +:; + +%post libs +/sbin/ldconfig + +%postun libs +/sbin/ldconfig + %changelog +* Tue Nov 13 2012 Vitezslav Crhonek - 2:2.12.0-5 +- Call ldconfig in %%post/%%postun of -libs subpackage +- Move .so links to -devel subpackage + * Wed Oct 24 2012 Vitezslav Crhonek - 2:2.12.0-4 - Fix CMPI enumGetNext function to change CMPI Data state from default CMPI_nullValue to CMPI_goodValue when it finds and returns next instance correctly