packages: corosync/corosync.spec - updated to 1.4.2 - enable dbus, snmp, rd...

[qboosh]

Author: qboosh                       Date: Sun Jan 22 20:41:05 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.4.2
- enable dbus, snmp, rdma by default

---- Files affected:
packages/corosync:
   corosync.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/corosync/corosync.spec
diff -u packages/corosync/corosync.spec:1.17 packages/corosync/corosync.spec:1.18
--- packages/corosync/corosync.spec:1.17	Sun May 22 15:42:05 2011
+++ packages/corosync/corosync.spec	Sun Jan 22 21:41:00 2012
@@ -1,32 +1,39 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	apidocs		# build apidocs
-%bcond_with	rdma		# build with RDMA support
+%bcond_with	apidocs		# build apidocs (man3 pages are provided anyway)
+%bcond_without	dbus		# DBus events
+%bcond_without	rdma		# RDMA support
+%bcond_without	snmp		# SNMP protocol support
 #
 Summary:	Corosync - OSI Certified implementation of a complete cluster engine
 Summary(pl.UTF-8):	Corosync - implementacja silnika klastrowego certyfikowana przez OSI
 Name:		corosync
-Version:	1.3.1
+Version:	1.4.2
 Release:	1
 License:	BSD
 Group:		Base
 Source0:	ftp://ftp:downloads@corosync.org/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	c58459a009a3a9d0b9c00e276a190d90
+# Source0-md5:	061ee5522097fee69475b38a66bf1d6a
 Patch0:		%{name}-makefile.patch
 URL:		http://www.corosync.org/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
+%{?with_dbus:BuildRequires:	dbus-devel}
 %{?with_apidocs:BuildRequires:	doxygen}
 %if %{with rdma}
 BuildRequires:	libibverbs-devel
 BuildRequires:	librdmacm-devel
 %endif
+%{?with_snmp:BuildRequires:	net-snmp-devel}
 BuildRequires:	nss-devel
 BuildRequires:	pkgconfig
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# short_service_name_get() is defined in executable
+%define		skip_post_check_so	libcoroipcs\.so.*
+
 %description
 The Corosync Cluster Engine is an OSI Certified implementation of a
 complete cluster engine.
@@ -75,6 +82,18 @@
 %description static -l pl.UTF-8
 Ten pakiet zawiera statyczne biblioteki Corosync.
 
+%package -n mibs-corosync
+Summary:	Corosync SNMP MIB data
+Summary(pl.UTF-8):	Dane SNMP MIB dla Corosync
+Group:		Applications/System
+Requires:	mibs-dirs
+
+%description -n mibs-corosync
+Corosync SNMP MIB data.
+
+%description -n mibs-corosync -l pl.UTF-8
+Dane SNMP MIB dla Corosync.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -84,9 +103,12 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+# options not yet supported: monitoring, watchdog, augeas
 %configure \
+	%{?with_dbus:--enable-dbus} \
 	--enable-nss \
 	%{?with_rdma:--enable-rdma} \
+	%{?with_snmp:--enable-snmp} \
 	--with-initddir=/etc/rc.d/init.d \
 	--with-lcrso-dir=%{_libdir}/lcrso
 
@@ -104,7 +126,7 @@
 
 sed -e 's/^/#/' $RPM_BUILD_ROOT%{_sysconfdir}/corosync/corosync.conf.example \
 	>$RPM_BUILD_ROOT%{_sysconfdir}/corosync/corosync.conf
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/corosync/corosync.conf.example
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/corosync/corosync.conf.example*
 
 %{?with_apidocs:install doc/api/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3}
 
@@ -116,8 +138,9 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog LICENSE README.devmap README.recovery SECURITY TODO
+%doc AUTHORS ChangeLog LICENSE README.devmap README.recovery SECURITY TODO conf/corosync.conf.example*
 %attr(754,root,root) /etc/rc.d/init.d/corosync
+%attr(754,root,root) /etc/rc.d/init.d/corosync-notifyd
 %dir %{_sysconfdir}/corosync
 %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/corosync/corosync.conf
 %attr(755,root,root) %{_bindir}/corosync-blackbox
@@ -126,6 +149,7 @@
 %attr(755,root,root) %{_sbindir}/corosync-cpgtool
 %attr(755,root,root) %{_sbindir}/corosync-fplay
 %attr(755,root,root) %{_sbindir}/corosync-keygen
+%attr(755,root,root) %{_sbindir}/corosync-notifyd
 %attr(755,root,root) %{_sbindir}/corosync-objctl
 %attr(755,root,root) %{_sbindir}/corosync-pload
 %attr(755,root,root) %{_sbindir}/corosync-quorumtool
@@ -137,6 +161,7 @@
 %{_mandir}/man8/corosync-cpgtool.8*
 %{_mandir}/man8/corosync-fplay.8*
 %{_mandir}/man8/corosync-keygen.8*
+%{_mandir}/man8/corosync-notifyd.8*
 %{_mandir}/man8/corosync-objctl.8*
 %{_mandir}/man8/corosync-pload.8*
 %{_mandir}/man8/corosync-quorumtool.8*
@@ -228,12 +253,22 @@
 %{_libdir}/libtotem_pg.a
 %{_libdir}/libvotequorum.a
 
+%if %{with snmp}
+%files -n mibs-corosync
+%defattr(644,root,root,755)
+%{_datadir}/snmp/mibs/COROSYNC-MIB.txt
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2012/01/22 20:41:00  qboosh
+- updated to 1.4.2
+- enable dbus, snmp, rdma by default
+
 Revision 1.17  2011/05/22 13:42:05  qboosh
 - updated to 1.3.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/corosync/corosync.spec?r1=1.17&r2=1.18&f=u