- files from fc package via adapter

Changed files:
    cluster-glue.spec -> 1.2

diff --git a/cluster-glue.spec b/cluster-glue.spec
index ff0615184030615e0182bcceb9b84d746a8289ef..1b57c16c023d9906e9a5673363ebb40cef3a04f6 100644 (file)
--- a/cluster-glue.spec
+++ b/cluster-glue.spec
@@ -1,13 +1,20 @@
-
+# TODO
+# - filterout fix needed:
+#   ./.libs/ipmilan.so: undefined reference to `stonith_free_hostlist'
+#   ./.libs/ipmilan.so: undefined reference to `PILCallLog'
+#   collect2: ld returned 1 exit status
+#   gmake[4]: *** [ipmilantest] Error 1
+#   gmake[4]: Leaving directory `/home/users/glen/rpm/BUILD.x86_64-linux/cluster-glue-1.0.2-rc2/lib/plugins/stonith'
+# - pld deps for "docbook-dtds"
 %define                subver  rc2
 %define                rel             0.1
 Summary:       Reusable cluster components
 Name:          cluster-glue
 Version:       1.0.2
 Release:       0.%{subver}.%{rel}
-License:       GPLv2+ and LGPLv2+
+License:       GPL v2+ and LGPL v2+
 Group:         Base
-URL:           http://www.clusterlabs.org
+URL:           http://www.clusterlabs.org/
 Source0:       http://www.linux-ha.org/w/images/3/3d/Cluster-glue-%{version}-%{subver}.tar.bz2
 # Source0-md5: 1f83b6bd83d9cae5310c32d14fecf2fd
 BuildRequires: OpenIPMI-devel
@@ -40,6 +47,8 @@ Obsoletes:    heartbeat-pils < 3.0.0-1
 Obsoletes:     heartbeat-stonith < 3.0.0-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                filterout_ld    -Wl,--as-needed
+
 %description
 A collection of common tools that are useful for writing cluster
 managers such as Pacemaker. Provides a local resource manager that
@@ -76,12 +85,13 @@ such as Pacemaker.
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-%{__make}
 %configure \
+       --with-initdir=/etc/rc.d/init.d \
        --enable-fatal-warnings=yes \
        --with-daemon-group=haclient \
        --with-daemon-user=hacluster\
        --docdir=%{_docdir}/%{name}-%{version}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -93,6 +103,8 @@ rm -rf $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.a' -exec rm {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
 
+#%{_docdir}/cluster-glue-1.0.2/stonith/README.bladehpi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,3 +113,71 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS logd/logd.cf doc/stonith/README*
+%attr(754,root,root) /etc/rc.d/init.d/logd
+
+%attr(755,root,root) %{_sbindir}/ha_logger
+%attr(755,root,root) %{_sbindir}/hb_report
+%attr(755,root,root) %{_sbindir}/lrmadmin
+%attr(755,root,root) %{_sbindir}/meatclient
+%attr(755,root,root) %{_sbindir}/stonith
+%attr(755,root,root) %{_sbindir}/sbd
+%{_mandir}/man1/*
+%{_mandir}/man8/*
+
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/ha_cf_support.sh
+%{_datadir}/%{name}/openais_conf_support.sh
+%{_datadir}/%{name}/utillib.sh
+%{_datadir}/%{name}/combine-logs.pl
+%{_datadir}/%{name}/ha_log.sh
+
+%dir %{_libdir}/heartbeat
+%dir %{_libdir}/heartbeat/plugins
+%dir %{_libdir}/heartbeat/plugins/RAExec
+%dir %{_libdir}/heartbeat/plugins/InterfaceMgr
+%{_libdir}/heartbeat/lrmd
+%{_libdir}/heartbeat/ha_logd
+%{_libdir}/heartbeat/plugins/RAExec/*.so
+%{_libdir}/heartbeat/plugins/InterfaceMgr/*.so
+
+%dir %{_libdir}/stonith
+%dir %{_libdir}/stonith/plugins
+%dir %{_libdir}/stonith/plugins/stonith2
+%{_libdir}/stonith/plugins/external
+%{_libdir}/stonith/plugins/stonith2/*.so
+%{_libdir}/stonith/plugins/stonith2/*.py*
+%{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper
+
+%dir %{_var}/lib/heartbeat
+%dir %{_var}/lib/heartbeat/cores
+%dir %attr(700,root,root) %{_var}/lib/heartbeat/cores/root
+%dir %attr(700,nobody,nobody) %{_var}/lib/heartbeat/cores/nobody
+%dir %attr(700,hacluster,haclient) %{_var}/lib/heartbeat/cores/hacluster
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so.*
+
+%files libs-devel
+%defattr(644,root,root,755)
+%{_includedir}/clplumbing
+%{_includedir}/heartbeat
+%{_includedir}/stonith
+%{_includedir}/pils
+
+%{_libdir}/lib*.so
+
+%dir %{_libdir}/heartbeat
+%dir %{_libdir}/heartbeat/plugins
+%dir %{_libdir}/heartbeat/plugins/test
+%{_libdir}/heartbeat/ipctest
+%{_libdir}/heartbeat/ipctransientclient
+%{_libdir}/heartbeat/ipctransientserver
+%{_libdir}/heartbeat/transient-test.sh
+%{_libdir}/heartbeat/base64_md5_test
+%{_libdir}/heartbeat/logtest
+%{_libdir}/heartbeat/plugins/test/test.so
+
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/lrmtest