rpms/tog-pegasus/devel tog-pegasus.spec,1.9,1.10

[fedora-cvs-commits redhat com]

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17079

Modified Files:
	tog-pegasus.spec 
Log Message:
- 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.



Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tog-pegasus.spec	14 Oct 2005 10:36:16 -0000	1.9
+++ tog-pegasus.spec	31 Oct 2005 20:42:22 -0000	1.10
@@ -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 @@
 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 @@
 %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 @@
 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 @@
 %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 @@
 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 @@
 
 %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 <jvdias redhat com>
+- 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 <tmraz redhat com>
 - use include instead of pam_stack in pam config