rpms/heartbeat/devel heartbeat.spec,1.28,1.29

[Kevin Fenzi]

Author: kevin

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12780

Modified Files:
	heartbeat.spec 
Log Message:
Remove fedora-usermgmt
Change subpackage names to match all the other heartbeat packages out there.



Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- heartbeat.spec	17 Jan 2009 23:13:23 -0000	1.28
+++ heartbeat.spec	24 Feb 2009 18:47:00 -0000	1.29
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.1.4
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -35,8 +35,7 @@
 %endif
 Requires:         ldirectord = %{version}-%{release}
 Requires:	  PyXML
-Requires(pre):    fedora-usermgmt
-Requires(postun): fedora-usermgmt
+Requires(pre):	  shadow-utils
 Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
 %if %{ENABLE_MGMT}
@@ -61,36 +60,42 @@
         - "ping" heartbeats (for routers, switches, etc.)
            (to be used for breaking ties in 2-node systems)
 
-%package -n ldirectord
+%package ldirectord
 Summary:          Monitor daemon for maintaining high availability resources
 Group:            System Environment/Daemons
 Requires:         ipvsadm
 Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
+Provides: ldirectord = %{version}-%{release}
+Obsoletes: ldirectord < 2.1.4-5
 
-%description -n ldirectord
+%description ldirectord
 ldirectord is a stand-alone daemon to monitor services of real 
 for virtual services provided by The Linux Virtual Server
 (http://www.linuxvirtualserver.org/). It is simple to install 
 and works with the heartbeat code (http://www.linux-ha.org/).
 
-%package -n stonith
+%package stonith
 Requires:       net-snmp-libs
 Summary:        Provides an interface to Shoot The Other Node In The Head 
 Group:          System Environment/Daemons
+Provides: stonith = %{version}-%{release}
+Obsoletes: stonith < 2.1.4-5
 
-%description -n stonith
+%description stonith
 The STONITH module (a.k.a. STONITH) provides an extensible interface
 for remotely powering down a node in the cluster.  The idea is quite simple:
 When the software running on one machine wants to make sure another
 machine in the cluster is not using a resource, pull the plug on the other 
 machine. It's simple and reliable, albeit admittedly brutal.
 
-%package -n pils
+%package pils
 Summary:        Provides a general plugin and interface loading library
 Group:          System Environment/Daemons
+Provides: pils = %{version}-%{release}
+Obsoletes: pils < 2.1.4-5
 
-%description -n pils
+%description pils
 PILS is an generalized and portable open source Plugin and Interface Loading 
 System. PILS was developed as part of the Open Cluster Framework reference 
 implementation, and is designed to be directly usable by a wide variety of 
@@ -172,9 +177,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/fedora-groupadd %{uid} -r %{gname} &>/dev/null || :
-/usr/sbin/fedora-useradd %{uid} -r -s /sbin/nologin -d /var/lib/heartbeat/cores/hacluster -M \
-        -c 'heartbeat user' -g %{gname} %{uname} &>/dev/null || :
+getent group %{gname} >/dev/null || groupadd -r %{gname}
+getent passwd %{uname} >/dev/null || \
+useradd -r -g %{gname} -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin \
+-c "heartbeat user" %{uname}
+exit 0
 
 %post
 /sbin/ldconfig
@@ -189,24 +196,22 @@
 fi
 
 /sbin/ldconfig
-test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
-test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
 
-%post -n ldirectord
+%post ldirectord
 /sbin/chkconfig --add ldirectord
 
-%postun -n ldirectord -p /sbin/ldconfig
+%postun ldirectord -p /sbin/ldconfig
 
-%preun -n ldirectord
+%preun ldirectord
 /sbin/chkconfig --del ldirectord
 
-%post -n stonith -p /sbin/ldconfig
+%post stonith -p /sbin/ldconfig
 
-%postun -n stonith -p /sbin/ldconfig
+%postun stonith -p /sbin/ldconfig
 
-%post -n pils -p /sbin/ldconfig
+%post pils -p /sbin/ldconfig
 
-%postun -n pils -p /sbin/ldconfig
+%postun pils -p /sbin/ldconfig
 
 %files -f haclient.lang
 %doc %{_datadir}/doc/%{name}-%{version}
@@ -292,7 +297,7 @@
 %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd
 %endif
 
-%files -n ldirectord
+%files ldirectord
 %doc doc/COPYING 
 %doc doc/README
 %doc ldirectord/ldirectord.cf
@@ -303,7 +308,7 @@
 %{_sysconfdir}/ha.d/resource.d/ldirectord
 %{_mandir}/man8/ldirectord.8*
 
-%files -n stonith
+%files stonith
 %doc doc/COPYING 
 %doc doc/README
 %defattr(-,root,root,-)
@@ -314,7 +319,7 @@
 %{_mandir}/man8/stonith.8*
 %{_mandir}/man8/meatclient.8*
 
-%files -n pils
+%files pils
 %doc doc/COPYING 
 %doc doc/README
 %defattr(-,root,root,-)
@@ -340,6 +345,10 @@
 %{_bindir}/hb_gui
 
 %changelog
+* Mon Feb 23 2009 Kevin Fenzi <kevin at tummy.com> - 2.1.4-5
+- Remove fedora-usermgmt
+- Change subpackage names to match all the other heartbeat packages out there.
+
 * Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 2.1.4-4
 - Main package shouldn't require pygtk2 (#480157)