- up to 1.99.5, many changes, start way to proper PLD reality

Changed files:
    heartbeat.spec -> 1.46

diff --git a/heartbeat.spec b/heartbeat.spec
index 28b9ce4ce7ee8904855df68c914e74c765d2db10..34829ccdd49dfd8f2d9bd74bffcf85f5209f9fe8 100644 (file)
--- a/heartbeat.spec
+++ b/heartbeat.spec
@@ -4,27 +4,32 @@ Summary(es):  Subsistema heartbeat para Linux "High-Availability"
 Summary(pl):   Podsystem heartbeat dla systemów o podwy¿szonej niezawodno¶ci
 Summary(pt_BR):        Implementa sistema de monitoração (heartbeats) visando Alta Disponibilidade
 Name:          heartbeat
-Version:       1.2.0
-Release:       0.1
+Version:       1.99.5
+Release:       0.2
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://linux-ha.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: b31e3f91c76fe006d2af94a868445293
-Patch0:                %{name}-ac.patch
+# Source0-md5: 808dd7884954553515757af6ad6dedb2
+Source1:       %{name}.init
+Source2:       ldirectord.init
 URL:           http://linux-ha.org/
 BuildRequires: OpenIPMI-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: curl-devel
-BuildRequires: glib-devel
+BuildRequires: gdbm-devel
+BuildRequires: glib2-devel
 BuildRequires: libnet-devel >= 1.1.0
 BuildRequires: libltdl-devel
 BuildRequires: libtool
+BuildRequires: libuuid-devel
+BuildRequires: libwrap-devel
 BuildRequires: libxml2-devel
 BuildRequires: net-snmp-devel
-BuildRequires: perl-libwww
+BuildRequires: pkgconfig
+BuildRequires: rpm-devel
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: swig
 PreReq:                rc-scripts
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
@@ -58,13 +63,37 @@ na przejmowanie adres
 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
-#Group: Utilities
+%package stonith
+Summary: Provides an interface to Shoot The Other Node In The Head
+Group: Utilities
+
+%description stonith
+
+%package ldirectord
+Summary:       Monitor daemon for maintaining high availability resources
+Group:         Utilities
+PreReq:         rc-scripts
+Requires(post,preun):   /sbin/chkconfig
+Requires:      ipvsadm
+
+%description ldirectord
+
+%package devel
+Summary:       -
+Group:         Networking/Utilities
+
+%description devel
+
+%package static
+Summary:       -
+Group:         Networking/Utilities
+%description static
+
+#%package
 
 %prep
 %setup -q
-%patch0 -p1
+#%%patch0 -p1
 
 rm -rf libltdl
 
@@ -75,7 +104,12 @@ rm -rf libltdl
 %{__automake}
 %configure \
        PING=/bin/ping \
-       --with-initdir=/etc/rc.d/init.d
+       MOUNT=/bin/mount \
+       FSCK=/sbin/fsck \
+       --with-initdir=/etc/rc.d/init.d \
+       --enable-lrm \
+       --enable-crm \
+       --enable-perl-vendor
 
 %{__make}
 
@@ -91,11 +125,23 @@ ln -sf %{_sbindir}/ldirectord $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/ldir
 # 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/etc/rc.d/init.d/heartbeat
+install %{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
+
 %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
@@ -129,7 +175,6 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc doc/{*.html,AUTHORS,apphbd.cf,authkeys,ha.cf,haresources,startstop}
-%attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 %dir %{_libdir}/heartbeat
 %dir %{_libdir}/heartbeat/cts
@@ -143,26 +188,53 @@ fi
 %dir %{_libdir}/pils/plugins
 %dir %{_libdir}/pils/plugins/*
 %attr(755,root,root) %{_libdir}/pils/plugins/*/*.so
-%dir %{_libdir}/stonith
-%dir %{_libdir}/stonith/plugins
-%dir %{_libdir}/stonith/plugins/stonith
-%attr(755,root,root) %{_libdir}/stonith/plugins/stonith/*.so
 %dir %{_sysconfdir}/ha.d
-%dir %{_sysconfdir}/ha.d/conf
 %attr(755,root,root) %{_sysconfdir}/ha.d/rc.d
 %attr(755,root,root) %{_sysconfdir}/ha.d/resource.d
 %{_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 size mtime md5) /etc/logrotate.d/heartbeat
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/ldirectord
+%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(754,root,root) /etc/rc.d/init.d/ldirectord
 %dir /var/lib/heartbeat
-%attr(750,root,haclient) %dir /var/lib/heartbeat/api
-%attr(1770,root,haclient) %dir /var/lib/heartbeat/casual
-#%attr(755,hacluster,haclient) %dir /var/lib/heartbeat/ccm
+#%%attr(750,root,haclient) %dir /var/lib/heartbeat/api
+#%%attr(1770,root,haclient) %dir /var/lib/heartbeat/casual
+#%%attr(755,hacluster,haclient) %dir /var/lib/heartbeat/ccm
 %attr(755,root,haclient) %dir /var/lib/heartbeat/ccm
-%attr(755,root,haclient) %dir /var/lib/heartbeat/ckpt
-%attr(600,root,root) /var/lib/heartbeat/fifo
+#%%attr(755,root,haclient) %dir /var/lib/heartbeat/ckpt
+#%%attr(600,root,root) /var/lib/heartbeat/fifo
+%{_mandir}/man1/*.1*
 %{_mandir}/man8/*.8*
+/var/lib/heartbeat/cores
+%attr(755,root,root)%{_bindir}/cl*
+%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
+
+%files stonith
+%defattr(644,root,root,755)
+%dir %{_libdir}/stonith
+%dir %{_libdir}/stonith/plugins
+%dir %{_libdir}/stonith/plugins/external
+%dir %{_libdir}/stonith/plugins/stonith2
+%{_libdir}/libstonith.so.*
+%attr(755,root,root) %{_libdir}/stonith/plugins/stonith2/*.so
+%attr(755,root,root) %{_sbindir}/meatclient
+%attr(755,root,root) %{_sbindir}/stonith
+
+%files ldirectord
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/ha.d/conf
+%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(754,root,root) /etc/rc.d/init.d/ldirectord
+%attr(755,root,root) %{_sbindir}/*ldirectord*
+%{_mandir}/man8/*ldirectord*8.gz
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}
+%{_libdir}/*.la
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/*.a