Set PEGASUS_ENABLE_INTEROP_PROVIDER=true, Move .so links back to main package

This commit is contained in:
Vitezslav Crhonek 2012-11-20 16:00:32 +01:00
parent d3193b83c4
commit 99d6aa38e5
2 changed files with 38 additions and 25 deletions

View File

@ -0,0 +1,12 @@
diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status.orig 2012-11-20 11:11:58.000000000 +0100
+++ pegasus/env_var_Linux.status 2012-11-20 11:12:16.650291672 +0100
@@ -34,7 +34,7 @@ PEGASUS_CIM_SCHEMA=CIM231
PEGASUS_USE_NET_SNMP=true
PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
-PEGASUS_ENABLE_INTEROP_PROVIDER=false
+PEGASUS_ENABLE_INTEROP_PROVIDER=true
PEGASUS_ENABLE_PROTOCOL_WSMAN=false
PEGASUS_ENABLE_SLP=true

View File

@ -8,7 +8,7 @@
Name: tog-pegasus
Version: %{major_ver}.0
Release: 5%{?dist}
Release: 6%{?dist}
Epoch: 2
Summary: OpenPegasus WBEM Services for Linux
@ -67,6 +67,8 @@ Patch21: pegasus-2.11.1-disable-privilege-separation.patch
# 22: Fix CMPI enumGetNext function to change CMPI Data state from default CMPI_nullValue
# to CMPI_goodValue when it finds and returns next instance correctly
Patch22: pegasus-2.12.0-null_value.patch
# 23: Enables Interop Provider - necessary to e. g. register CMPI providers
Patch23: pegasus-2.12.0-enable_interop_provider.patch
BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++
BuildRequires: libstdc++, make, pam-devel
@ -195,6 +197,7 @@ rm -rf pegasus/
%patch20 -p1 -b .sparc-locks
%patch21 -p1 -b .disable-privilege-separation
%patch22 -p1 -b .null_value
%patch23 -p1 -b .enable_interop_provider
%build
@ -316,15 +319,10 @@ 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}/*.so.*
%{_libdir}/Pegasus/providerManagers/*.so.*
%{_libdir}/Pegasus/providers/*.so.*
%{_libdir}/*
%exclude /usr/lib/debug
%if %{PEGASUS_BUILD_TEST_RPM}
@ -396,7 +394,22 @@ fi
/sbin/ldconfig
%systemd_postun_with_restart tog-pegasus.service
%post devel
%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
if [ $1 -eq 1 ]; then
# Create Symbolic Links for SDK Libraries
#
@ -431,23 +444,6 @@ if [ $1 -eq 1 ]; then
/bin/chgrp -h pegasus /usr/%{_lib}/Pegasus/providerManagers/libCMPIProviderManager.so
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
@ -455,6 +451,11 @@ fi
%changelog
* Tue Nov 20 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.12.0-6
- Set PEGASUS_ENABLE_INTEROP_PROVIDER=true (fixes registration of CMPI providers)
- Move .so links back to main package (they are necessary to be present for a user
to use or execute the functionality in the base package properly)
* Tue Nov 13 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.12.0-5
- Call ldconfig in %%post/%%postun of -libs subpackage
- Move .so links to -devel subpackage