packages: heartbeat/heartbeat.spec, heartbeat/heartbeat-no_ipmilan_test.pat...

glen glen at pld-linux.org
Wed Jan 13 19:34:01 CET 2010 

Author: glen                         Date: Wed Jan 13 18:34:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.0.2 rc2
- stonith moved to resource-clue
- ldirectord moved to resource-agents
- builds, packages, nothing else

---- Files affected:
packages/heartbeat:
   heartbeat.spec (1.93 -> 1.94) , heartbeat-no_ipmilan_test.patch (1.1 -> NONE)  (REMOVED), ldirectord.init (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/heartbeat/heartbeat.spec
diff -u packages/heartbeat/heartbeat.spec:1.93 packages/heartbeat/heartbeat.spec:1.94
--- packages/heartbeat/heartbeat.spec:1.93	Wed Dec  9 15:25:12 2009
+++ packages/heartbeat/heartbeat.spec	Wed Jan 13 19:33:56 2010
@@ -1,25 +1,40 @@
 # $Revision$, $Date$
+# NOTE:
+# - In post-2.1.4 releases, Linux-HA code is packaged in three different
+#   sub-projects, leading to three separate tarballs for each release: one for
+#   Heartbeat, one for Cluster Glue, and one for the Resource Agents. The three
+#   projects have separate release cycles, a release for one sub-project may or
+#   may not coincide with that of another.
+#   The former Heartbeat CRM is now maintained as the Pacemaker project, also
+#   on its own release cycle.
+# TODO
+# - from above note: Cluster Glue, Resource Agents, Heartbeat CRM packages
+#   - resource agent patch: heartbeat-no_ipmilan_test.patch
+# - merge mibs supackage from 2.1 branch
+# - cleanup deps, users for 3.x
+# - fixup deps, inner deps, think of subpackages, ugprade path from 2.1
 #
 %include	/usr/lib/rpm/macros.perl
+%define		subver	rc2
+%define		rel		0.1
 Summary:	Heartbeat - subsystem for High-Availability Linux
 Summary(es.UTF-8):	Subsistema heartbeat para Linux "High-Availability"
 Summary(pl.UTF-8):	Podsystem heartbeat dla systemów o podwyższonej niezawodności
 Summary(pt_BR.UTF-8):	Implementa sistema de monitoração (heartbeats) visando Alta Disponibilidade
 Name:		heartbeat
-Version:	2.99.2
-Release:	2
+Version:	3.0.2
+Release:	0.%{subver}.%{rel}
 License:	GPL v2+
 Group:		Applications/System
-Source0:	http://hg.linux-ha.org/dev/archive/beta-%{version}.tar.bz2
-# Source0-md5:	ef79dc10100451bfcbb55b4707d28eb1
+Source0:	http://www.linux-ha.org/w/images/3/32/Heartbeat-%{version}-%{subver}.tar.bz2
+# Source0-md5:	3c45d668ebb9f964caa1b40fd0808745
 Source1:	%{name}.init
-Source2:	ldirectord.init
 Patch0:		%{name}-ac.patch
-Patch1:		%{name}-no_ipmilan_test.patch
 URL:		http://www.linux-ha.org/Heartbeat
 BuildRequires:	OpenIPMI-devel >= 2.0.3
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	cluster-glue-libs-devel
 BuildRequires:	gdbm-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gnutls-devel
@@ -41,21 +56,12 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	swig-perl >= 1.3.25
 BuildRequires:	swig-python >= 1.3.25
-Requires(post,postun):	/sbin/ldconfig
-Requires(post,preun):	/sbin/chkconfig
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Requires(pre):	/bin/id
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/useradd
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	psmisc >= 22.5-2
+Requires:	resource-agents
 Requires:	rc-scripts
 Requires:	syslogdaemon
 Requires:	which
-Provides:	group(haclient)
-Provides:	user(hacluster)
 # disappeared
 Obsoletes:	perl-heartbeat
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -86,37 +92,6 @@
 konfiguracji składającej się z 2 hostów, można je również stosować do
 bardziej skomplikowanych konfiguracji.
 
-%package stonith
-Summary:	Provides an interface to Shoot The Other Node In The Head
-Summary(pl.UTF-8):	Interfejs do "odstrzelenia" drugiego węzła w klastrze
-Group:		Applications/System
-Requires:	OpenIPMI >= 2.0.3
-
-%description stonith
-Provides an interface to Shoot The Other Node In The Head.
-
-%description stonith -l pl.UTF-8
-STONITH (Shoot The Other Node In The Head) to interfejs służący do
-"odstrzelenia" drugiego węzła w klastrze.
-
-%package ldirectord
-Summary:	Monitor virtual services provided by LVS
-Summary(pl.UTF-8):	Demon monitorujący wirtualne usługi dostarczane poprzez LVS
-Group:		Applications/System
-Requires(post,preun):	/sbin/chkconfig
-Requires:	ipvsadm
-Requires:	rc-scripts
-
-%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/>.
-
-%description ldirectord -l pl.UTF-8
-ldirectord to samodzielny demon monitorujący rzeczywiste usługi dla
-wirtualnych usług dostarczanych poprzez Linux Virtual Server
-<http://www.linuxvirtualserver.org/>.
-
 %package libs
 Summary:	Heartbeat libraries
 Summary(pl.UTF-8):	Biblioteki heartbeat
@@ -166,10 +141,8 @@
 Zestaw testów klastra opartego o heartbeat.
 
 %prep
-%setup -qn Linux-HA-Dev-beta-%{version}
+%setup -qn %{name}-%{version}-%{subver}
 %patch0 -p1
-%patch1 -p1
-
 rm -rf libltdl
 
 %build
@@ -179,13 +152,8 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	FSCK=/sbin/fsck \
-	FUSER=/bin/fuser \
-	IPTABLES=/usr/sbin/iptables \
-	MAILCMD=/bin/mail \
-	MOUNT=/bin/mount \
-	PING=/bin/ping \
 	--with-initdir=/etc/rc.d/init.d \
+	--docdir=%{_docdir}/%{name}-%{version} \
 	--enable-fatal-warnings=no \
 	--enable-mgmt \
 	--enable-quorumd \
@@ -195,165 +163,123 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/var/run/heartbeat
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/ldirectord
-ln -sf %{_sbindir}/ldirectord $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/ldirectord
+install -d $RPM_BUILD_ROOT/var/run/heartbeat
 
 # plugins are lt_dlopened, but using *.so names, so *.la are not used
-rm -f $RPM_BUILD_ROOT%{_libdir}/{heartbeat,pils,stonith}/plugins/*/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/heartbeat/plugins/*/*.{la,a}
 
 rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/heartbeat
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/heartbeat
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/heartbeat
 
 > $RPM_BUILD_ROOT/etc/ha.d/haresources
 echo -e "auth 2\n2 crc" > $RPM_BUILD_ROOT/etc/ha.d/authkeys
-install doc/ha.cf $RPM_BUILD_ROOT/etc/ha.d
-
-rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/ldirectord
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldirectord
-install ldirectord/ldirectord.cf $RPM_BUILD_ROOT%{_sysconfdir}/ha.d
+cp -a doc/ha.cf $RPM_BUILD_ROOT/etc/ha.d
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/heartbeat/cts/README
-
-for tool in ha_logger hb_addnode hb_delnode hb_standby hb_takeover; do
-	ln -sf %{_libdir}/heartbeat/$tool $RPM_BUILD_ROOT%{_bindir}
+for tool in hb_addnode hb_delnode hb_standby hb_takeover; do
+	tool=%{_datadir}/%{name}/$tool
+	[ -x $RPM_BUILD_ROOT$tool ] || exit 1
+	ln -s $tool $RPM_BUILD_ROOT%{_bindir}
 done
 
+rm $RPM_BUILD_ROOT%{_datadir}/heartbeat/cts/README
+
 sed -i -e's, /%{_lib}/libpam.la, /usr/%{_lib}/libpam.la,g' $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-%groupadd -g 60 haclient
-%useradd -u 17 -d /var/lib/heartbeat/cores/hacluster -c "Heartbeat User" -g haclient hacluster
-
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add heartbeat
-%service %{name} restart
+%service heartbeat restart
 
 %preun
 if [ "$1" = "0" ]; then
-	%service -q %{name} stop
+	%service -q heartbeat stop
 	/sbin/chkconfig --del heartbeat
 fi
 
-%postun
-/sbin/ldconfig
-if [ "$1" = "0" ]; then
-	%userremove hacluster
-	%groupremove haclient
-fi
-
-%post	stonith -p /sbin/ldconfig
-%postun	stonith -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc doc/{*.html,AUTHORS,apphbd.cf,authkeys,ha.cf,logd.cf,haresources,startstop}
+%doc doc/{*.html,AUTHORS,apphbd.cf,authkeys,ha.cf,haresources,startstop}
 %dir %{_libdir}/heartbeat
 %dir %{_libdir}/heartbeat/plugins
 %dir %{_libdir}/heartbeat/plugins/*
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/*/*.so
 %attr(755,root,root) %{_libdir}/heartbeat/[!cp]*
 %attr(755,root,root) %{_libdir}/heartbeat/c[!t]*
-%dir %{_libdir}/pils
-%dir %{_libdir}/pils/plugins
-%dir %{_libdir}/pils/plugins/*
 %dir %{_datadir}/heartbeat
 %attr(755,root,root) %{_datadir}/heartbeat/BasicSanityCheck
 %attr(755,root,root) %{_datadir}/heartbeat/ResourceManager
 %attr(755,root,root) %{_datadir}/heartbeat/TestHeartbeatComm
 %attr(755,root,root) %{_datadir}/heartbeat/ha_*
 %attr(755,root,root) %{_datadir}/heartbeat/hb_*
-%attr(755,root,root) %{_datadir}/heartbeat/lrmtest
 %attr(755,root,root) %{_datadir}/heartbeat/mach_down
 %attr(755,root,root) %{_datadir}/heartbeat/req_resource
-%attr(755,root,root) %{_datadir}/heartbeat/utillib.sh
-%{_datadir}/heartbeat/ra-api-1.dtd
-%attr(755,root,root) %{_libdir}/pils/plugins/*/*.so
 %dir %{_sysconfdir}/ha.d
 %attr(755,root,root) %{_sysconfdir}/ha.d/rc.d
 %attr(755,root,root) %{_sysconfdir}/ha.d/resource.d
-%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord
 %{_sysconfdir}/ha.d/README.config
 %attr(755,root,root) %{_sysconfdir}/ha.d/harc
-%{_sysconfdir}/ha.d/shellfuncs
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/heartbeat
 %attr(754,root,root) /etc/rc.d/init.d/heartbeat
-%attr(755,root,root) %{_prefix}/lib/ocf
 %dir /var/run/heartbeat
 %attr(750,hacluster,haclient) %dir /var/run/heartbeat/ccm
 %dir /var/lib/heartbeat
-%attr(770,root,haclient) %dir /var/lib/heartbeat/lrm
-%attr(711,root,root) %dir /var/lib/heartbeat/cores
-%attr(700,root,root) %dir /var/lib/heartbeat/cores/root
-# we don't want any files owned by nobody
-%attr(700,root,root) %dir /var/lib/heartbeat/cores/nobody
-%attr(700,hacluster,root) %dir /var/lib/heartbeat/cores/hacluster
 %{_mandir}/man1/*.1*
 %{_mandir}/man8/[a-h]*.8*
+%{_mandir}/man5/authkeys.5*
+%{_mandir}/man5/ha.cf.5*
 %attr(755,root,root) %{_bindir}/cl_respawn
 %attr(2755,root,haclient) %{_bindir}/cl_status
-%attr(755,root,root) %{_bindir}/ha_logger
 %attr(755,root,root) %{_bindir}/hb_addnode
 %attr(755,root,root) %{_bindir}/hb_delnode
 %attr(755,root,root) %{_bindir}/hb_standby
 %attr(755,root,root) %{_bindir}/hb_takeover
-%attr(755,root,root) %{_sbindir}/[a-i]*
-%attr(755,root,root) %{_sbindir}/ocf-tester
-%attr(755,root,root) %{_sbindir}/sbd
-%attr(755,root,root) %{_sbindir}/sfex_init
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/haresources
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/authkeys
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/ha.cf
-
-%files stonith
-%defattr(644,root,root,755)
-%dir %{_libdir}/stonith
-%dir %{_libdir}/stonith/plugins
-%dir %{_libdir}/stonith/plugins/external
-%dir %{_libdir}/stonith/plugins/stonith2
-%attr(755,root,root) %{_libdir}/stonith/plugins/*/*
-%attr(755,root,root) %{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper
-%attr(755,root,root) %{_sbindir}/meatclient
-%attr(755,root,root) %{_sbindir}/stonith
-%{_mandir}/man8/stonith.8*
-%{_mandir}/man8/meatclient.8*
-
-%files ldirectord
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/ldirectord.cf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ldirectord
-%attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/ldirectord
-%attr(754,root,root) /etc/rc.d/init.d/ldirectord
-%attr(755,root,root) %{_sbindir}/*ldirectord*
-%{_mandir}/man8/*ldirectord*.8*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ha.d/haresources
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ha.d/authkeys
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ha.d/ha.cf
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.[0-9]
+%attr(755,root,root) %{_libdir}/libapphb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libapphb.so.2
+%attr(755,root,root) %{_libdir}/libccmclient.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libccmclient.so.1
+%attr(755,root,root) %{_libdir}/libclm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclm.so.1
+%attr(755,root,root) %{_libdir}/libhbclient.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhbclient.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/*.la
+%{_includedir}/heartbeat
+%{_includedir}/ocf
+%{_includedir}/saf
+%attr(755,root,root) %{_libdir}/libapphb.so
+%attr(755,root,root) %{_libdir}/libccmclient.so
+%attr(755,root,root) %{_libdir}/libclm.so
+%attr(755,root,root) %{_libdir}/libhbclient.so
+%{_libdir}/libapphb.la
+%{_libdir}/libccmclient.la
+%{_libdir}/libclm.la
+%{_libdir}/libhbclient.la
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libapphb.a
+%{_libdir}/libccmclient.a
+%{_libdir}/libclm.a
+%{_libdir}/libhbclient.a
 
 %files cts
 %defattr(644,root,root,755)
 %doc cts/README
-%{_libdir}/heartbeat/cts
 %dir %{_datadir}/heartbeat/cts
 %attr(755,root,root) %{_datadir}/heartbeat/cts/*.py
 %{_datadir}/heartbeat/cts/*.py[co]
@@ -366,6 +292,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2010/01/13 18:33:56  glen
+- up to 3.0.2 rc2
+- stonith moved to resource-clue
+- ldirectord moved to resource-agents
+- builds, packages, nothing else
+
 Revision 1.93  2009/12/09 14:25:12  baggins
 - no parallel install
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heartbeat/heartbeat.spec?r1=1.93&r2=1.94&f=u

More information about the pld-cvs-commit mailing list