Author: jajcus Date: Mon May 11 13:19:07 2009 GMT Module: packages Tag: HEAD ---- Log message: - new package
---- Files affected: packages/pacemaker: pacemaker-liborder.patch (NONE -> 1.1) (NEW), pacemaker-ncurses.patch (NONE -> 1.1) (NEW), pacemaker.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/pacemaker/pacemaker-liborder.patch diff -u /dev/null packages/pacemaker/pacemaker-liborder.patch:1.1 --- /dev/null Mon May 11 15:19:07 2009 +++ packages/pacemaker/pacemaker-liborder.patch Mon May 11 15:19:02 2009 @@ -0,0 +1,88 @@ +--- Pacemaker-1-0-Pacemaker-1.0.3/pengine/Makefile.am~ 2009-04-07 14:18:12.000000000 +0200 ++++ Pacemaker-1-0-Pacemaker-1.0.3/pengine/Makefile.am 2009-05-11 14:43:46.000000000 +0200 +@@ -50,9 +50,10 @@ + # $(top_builddir)/lib/hbclient/libhbclient.la + + ptest_SOURCES = ptest.c +-ptest_LDADD = $(COMMONLIBS) \ +- $(top_builddir)/lib/cib/libcib.la \ +- $(top_builddir)/lib/transition/libtransitioner.la ++ptest_LDADD = $(top_builddir)/pengine/libpengine.la \ ++ $(top_builddir)/lib/cib/libcib.la \ ++ $(top_builddir)/lib/transition/libtransitioner.la \ ++ $(COMMONLIBS) + + clean-generic: + rm -f *.log *.debug *~ .gres.* testcases/.gres.* +--- Pacemaker-1-0-Pacemaker-1.0.3/tools/Makefile.am.orig 2009-04-07 14:18:12.000000000 +0200 ++++ Pacemaker-1-0-Pacemaker-1.0.3/tools/Makefile.am 2009-05-11 15:01:31.000000000 +0200 +@@ -24,7 +24,7 @@ + COMMONLIBS = \ + $(top_builddir)/lib/common/libcrmcommon.la \ + $(top_builddir)/lib/cib/libcib.la \ +- -lplumb $(CURSESLIBS) $(CLUSTERLIBS) ++ -lplumb $(CLUSTERLIBS) $(CURSESLIBS) + + headerdir = $(pkgincludedir)/crm + header_HEADERS = attrd.h +@@ -52,8 +52,8 @@ + noinst_HEADERS = + + crmadmin_SOURCES = crmadmin.c +-crmadmin_LDADD = $(COMMONLIBS) $(CLUSTERLIBS) \ +- $(top_builddir)/lib/pengine/libpe_status.la ++crmadmin_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \ ++ $(CLUSTERLIBS) $(COMMONLIBS) + + crm_uuid_SOURCES = crm_uuid.c + crm_uuid_LDADD = $(top_builddir)/lib/common/libcrmcluster.la +@@ -65,21 +65,21 @@ + crm_shadow_LDADD = $(COMMONLIBS) + + crm_node_SOURCES = ccm_epoche.c +-crm_node_LDADD = $(COMMONLIBS) $(CLUSTERLIBS) \ +- $(top_builddir)/lib/common/libcrmcluster.la ++crm_node_LDADD = $(top_builddir)/lib/common/libcrmcluster.la \ ++ $(CLUSTERLIBS) $(COMMONLIBS) + + crm_diff_SOURCES = xml_diff.c + crm_diff_LDADD = $(COMMONLIBS) + + crm_mon_SOURCES = crm_mon.c +-crm_mon_LDADD = $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \ +- $(top_builddir)/lib/pengine/libpe_status.la ++crm_mon_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \ ++ -llrm $(SNMPLIBS) $(ESMTPLIBS) $(COMMONLIBS) + + # Arguments could be made that this should live in crm/pengine + crm_verify_SOURCES = crm_verify.c +-crm_verify_LDADD = $(COMMONLIBS) \ ++crm_verify_LDADD = \ + $(top_builddir)/lib/pengine/libpe_status.la \ +- $(top_builddir)/pengine/libpengine.la ++ $(top_builddir)/pengine/libpengine.la $(COMMONLIBS) + + crm_master_SOURCES = crm_attribute.c + crm_master_LDADD = $(COMMONLIBS) +@@ -94,9 +94,10 @@ + crm_failcount_LDADD = $(COMMONLIBS) + + crm_resource_SOURCES = crm_resource.c +-crm_resource_LDADD = $(COMMONLIBS) \ ++crm_resource_LDADD = \ + $(top_builddir)/lib/pengine/libpe_rules.la \ +- $(top_builddir)/lib/pengine/libpe_status.la ++ $(top_builddir)/lib/pengine/libpe_status.la \ ++ $(COMMONLIBS) + + iso8601_SOURCES = test.iso8601.c + iso8601_LDADD = $(COMMONLIBS) +@@ -104,7 +105,7 @@ + # A little trick. Now ccdv can be auto-built but not auto-cleaned. + attrd_DEPENDENCIES = ccdv + attrd_SOURCES = attrd.c +-attrd_LDADD = $(COMMONLIBS) $(top_builddir)/lib/common/libcrmcluster.la ++attrd_LDADD = $(top_builddir)/lib/common/libcrmcluster.la $(COMMONLIBS) + + pingd_SOURCES = pingd.c + pingd_LDADD = $(COMMONLIBS) ================================================================ Index: packages/pacemaker/pacemaker-ncurses.patch diff -u /dev/null packages/pacemaker/pacemaker-ncurses.patch:1.1 --- /dev/null Mon May 11 15:19:08 2009 +++ packages/pacemaker/pacemaker-ncurses.patch Mon May 11 15:19:02 2009 @@ -0,0 +1,15 @@ +--- Pacemaker-1-0-Pacemaker-1.0.3/configure.in.orig 2009-05-11 14:26:54.000000000 +0200 ++++ Pacemaker-1-0-Pacemaker-1.0.3/configure.in 2009-05-11 14:26:54.000000000 +0200 +@@ -746,8 +746,12 @@ + [ + #if defined(HAVE_CURSES_H) + # include <curses.h> ++#elif defined(HAVE_CURSES_CURSES_H) ++# include <curses/curses.h> + #elif defined(HAVE_NCURSES_H) + # include <ncurses.h> ++#elif defined(HAVE_NCURSES_NCURSES_H) ++# include <ncurses/ncurses.h> + #endif + ], + [printw((const char *)"Test");] ================================================================ Index: packages/pacemaker/pacemaker.spec diff -u /dev/null packages/pacemaker/pacemaker.spec:1.1 --- /dev/null Mon May 11 15:19:08 2009 +++ packages/pacemaker/pacemaker.spec Mon May 11 15:19:02 2009 @@ -0,0 +1,164 @@ +# $Revision$, $Date$ +# +# TODO: +# - OpenAIS support +# +Summary: The scalable High-Availability cluster resource manager +Name: pacemaker +Version: 1.0.3 +Release: 0.1 +License: GPL v2+; LGPL v2.1+ +Group: Applications/System +Source0: http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-%{version}.tar.bz2 +# Source0-md5: b377be64de0920773168bda3abf54319 +Patch0: %{name}-ncurses.patch +Patch1: %{name}-liborder.patch +URL: http://clusterlabs.org/wiki/Main_Page +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bzip2-devel +BuildRequires: e2fsprogs-devel +BuildRequires: glib2-devel +BuildRequires: gnutls-devel +BuildRequires: heartbeat-devel >= 2.99 +BuildRequires: libesmtp-devel +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel +BuildRequires: ncurses-devel +BuildRequires: net-snmp-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: swig +Requires: %{name}-libs = %{version}-%{release} +Requires: hearbeat +Conflicts: heartbeat < 2.99.0 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Pacemaker makes use of your cluster infrastructure (either OpenAIS or +Heartbeat) to stop, start and monitor the health of the services (aka. +resources) you want the cluster to provide. + +It can do this for clusters of practically any size and comes with a +powerful dependency model that allows the administrator to accurately +express the relationships (both ordering and location) between the +cluster resources. + +Pacemaker was formely a part of Heartbeat. + +%package libs +Summary: Pacemaker libraries +Group: Libraries + +%description libs +Shared libraries for Pacemaker. + +%package devel +Summary: Header files for Pacemaker libraries +Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Pacemaker +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description devel +Header files for Pacemaker libraries. + +%package static +Summary: Static Pacemaker libraries +Summary(pl.UTF-8): Statyczne biblioteki Pacemaker +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static Pacemaker libraries. + +%prep +%setup -qn Pacemaker-1-0-Pacemaker-%{version} +%patch0 -p1 +%patch1 -p1 + +%build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} + +%configure \ + --with-heartbeat \ + --without-ais \ + --with-snmp \ + --with-esmtp \ + --disable-fatal-warnings + +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +rm -r $RPM_BUILD_ROOT%{_docdir}/packages + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc doc/README* doc/*.html doc/*.txt doc/AUTHORS doc/Design +%{_datadir}/pacemaker +%{_libdir}/heartbeat/* +%attr(755,root,root) %{_sbindir}/cibadmin +%attr(755,root,root) %{_sbindir}/crm_attribute +%attr(755,root,root) %{_sbindir}/crm_diff +%attr(755,root,root) %{_sbindir}/crm_failcount +%attr(755,root,root) %{_sbindir}/crm_master +%attr(755,root,root) %{_sbindir}/crm_mon +%attr(755,root,root) %{_sbindir}/crm +%attr(755,root,root) %{_sbindir}/crm_resource +%attr(755,root,root) %{_sbindir}/crm_standby +%attr(755,root,root) %{_sbindir}/crm_verify +%attr(755,root,root) %{_sbindir}/crmadmin +%attr(755,root,root) %{_sbindir}/iso8601 +%attr(755,root,root) %{_sbindir}/attrd_updater +%attr(755,root,root) %{_sbindir}/ptest +%attr(755,root,root) %{_sbindir}/crm_shadow +%attr(755,root,root) %{_sbindir}/cibpipe +%attr(755,root,root) %{_sbindir}/crm_node +%attr(755,root,root) %{_sbindir}/crm_uuid +%{_mandir}/man8/*.8* +%dir %attr(750,hacluster,haclient) %{_var}/lib/heartbeat/crm +%dir %attr(750,hacluster,haclient) %{_var}/lib/pengine +%dir %attr(750,hacluster,haclient) %{_var}/run/crm +%dir %{_libdir}/ocf +%dir %{_libdir}/ocf/resource.d +%{_libdir}/ocf/resource.d/pacemaker +#%{_libexecdir}/lcrso/pacemaker.lcrso + +%files libs +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/lib*.so.*.* +%attr(755,root,root) %{_libdir}/lib*.so.[0-9] + +%files devel +%defattr(644,root,root,755) +%{_includedir}/pacemaker +%{_includedir}/heartbeat/fencing +%{_libdir}/*.so +%{_libdir}/*.la + +%files static +%defattr(644,root,root,755) +%{_libdir}/*.a + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team <[email protected]> +All persons listed below can be reached at <cvs_login>@pld-linux.org + +$Log$ +Revision 1.1 2009/05/11 13:19:02 jajcus +- new package + ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
