From d2fecc63447e45da7e265a8156be8247ba96bcdd Mon Sep 17 00:00:00 2001 From: jvdias Date: Mon, 31 Oct 2005 20:42:22 +0000 Subject: [PATCH] - Add /usr/lib/cmpi alternate providerLibDir for sblim-cmpi-base Fedora Extras pkg - Fix bug 171124: use numeric ids for pegasus user/group - guidelines: do not remove pegasus user/group in %%postun. --- tog-pegasus.spec | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tog-pegasus.spec b/tog-pegasus.spec index ce04bdd..7580b24 100644 --- a/tog-pegasus.spec +++ b/tog-pegasus.spec @@ -14,7 +14,7 @@ Summary: OpenPegasus WBEM Services for Linux Name: tog-pegasus Version: 2.5 -Release: 1 +Release: 2 Epoch: 2 Group: Systems Management/Base License: Open Group Pegasus Open Source @@ -29,6 +29,7 @@ Source4: genSSLcerts Patch0: pegasus-2.5-redhat.patch Patch1: pegasus-2.5-local-or-remote-auth.patch Patch2: pegasus-2.5-make_install.patch +Patch3: pegasus-2.5-add_cmpi_provider_lib.patch BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++, libstdc++, make, pam-devel, krb5-devel, krb5-libs, openssl-devel >= 0.9.6, e2fsprogs Requires: bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools Requires(post): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools @@ -71,6 +72,7 @@ The OpenPegasus WBEM tests for the OpenPegasus 2.5 Linux rpm. %patch0 -p1 -b .redhat %patch1 -p1 -b .local_or_remote_auth %patch2 -p1 -b .make_install +%patch3 -p1 -b .add_cmpi_provider_lib %build rm -rf $RPM_BUILD_ROOT @@ -108,6 +110,7 @@ chmod 640 $RPM_BUILD_ROOT/${PEGASUS_CONFIG_DIR}/access.conf mkdir -p $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts cp -fp %SOURCE4 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts chmod 750 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts/genSSLcerts +mkdir -p $R$RPM_BUILD_ROOT/usr/%{_lib}/cmpi :; %files @@ -136,6 +139,7 @@ chmod 750 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts/genSSLcerts %attr(0755,root,pegasus) /usr/bin/* %attr(0755,root,pegasus) /usr/%{_lib}/*.so.* %dir /usr/%{_lib}/Pegasus/providers +%dir /usr/%{_lib}/cmpi %attr(0755,root,pegasus) /usr/%{_lib}/Pegasus/providers/*.so.* /usr/share/Pegasus/mof %dir /usr/share/Pegasus/scripts @@ -184,8 +188,8 @@ if [ $1 -gt 1 ]; then elif [ $1 -eq 1 ]; then # first install: create the 'pegasus' user and group: # By default, ONLY the "pegasus" user will be allowed to connect to cimserver over network - /usr/sbin/groupadd pegasus >/dev/null 2>&1 || :; - /usr/sbin/useradd -c "tog-pegasus OpenPegasus WBEM/CIM services" -g pegasus \ + /usr/sbin/groupadd pegasus -g 66 >/dev/null 2>&1 || :; + /usr/sbin/useradd -u 66 -c "tog-pegasus OpenPegasus WBEM/CIM services" -g pegasus \ -s /sbin/nologin -r -d /var/lib/Pegasus pegasus >/dev/null 2>&1 || :; fi @@ -209,15 +213,21 @@ fi %postun if [ $1 -eq 0 ]; then - /usr/sbin/userdel pegasus >/dev/null 2>&1 || :; - /usr/sbin/groudel pegasus >/dev/null 2>&1 || :; +# /usr/sbin/userdel pegasus >/dev/null 2>&1 || :; +# /usr/sbin/groudel pegasus >/dev/null 2>&1 || :; +:; fi; %clean -#rm -rf $RPM_BUILD_ROOT; +rm -rf $RPM_BUILD_ROOT; #rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version}; %changelog +* Mon Oct 31 2005 Jason Vas Dias +- Add /usr/lib/cmpi alternate providerLibDir for sblim-cmpi-base Fedora Extras pkg +- Fix bug 171124: use numeric ids for pegasus user/group +- guidelines: do not remove pegasus user/group in %%postun. + * Fri Oct 14 2005 Tomas Mraz - use include instead of pam_stack in pam config