[cluster] New upstream release

[Fabio M. Di Nitto]

commit 6d25d77757e130d51d5fb02cc9c3c88ca32a8034
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Tue Mar 8 10:07:44 2011 +0100

    New upstream release
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

 .gitignore               |    1 +
 cluster.spec             |   19 ++++++++++++++-----
 sources                  |    2 +-
 systemd_workaround.patch |   39 ---------------------------------------
 4 files changed, 16 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 599249e..4555a9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ cluster-3.0.14.tar.bz2
 /cluster-3.0.17.tar.bz2
 /cluster-3.1.0.tar.bz2
 /cluster-3.1.0.tar.xz
+/cluster-3.1.1.tar.xz
diff --git a/cluster.spec b/cluster.spec
index b36b5c0..3b673f8 100644
--- a/cluster.spec
+++ b/cluster.spec
@@ -18,13 +18,12 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.1.0
-Release: 7%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.1.1
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sourceware.org/cluster/wiki/
 Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.xz
-Patch0: systemd_workaround.patch
 
 ## Setup/build bits
 
@@ -37,10 +36,10 @@ BuildRequires: libxml2-devel ncurses-devel
 BuildRequires: corosynclib-devel >= 1.2.8-1
 BuildRequires: openaislib-devel >= 1.1.4-1
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
+BuildRequires: dbus-devel
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 
 %build
 ./configure \
@@ -138,11 +137,13 @@ fi
 /usr/libexec/*
 %dir %{_datadir}/cluster
 %{_datadir}/cluster/cluster.rng
+%{_datadir}/cluster/checkquorum
 %{perl_vendorarch}/*
 %dir /var/log/cluster
 %dir /var/lib/cluster
 %{_mandir}/man5/*
 %{_mandir}/man8/ccs*
+%{_mandir}/man8/checkquorum.8.gz
 %{_mandir}/man8/cman*
 %{_mandir}/man8/confdb2ldif*
 %{_mandir}/man8/dlm*
@@ -154,6 +155,7 @@ fi
 %package -n clusterlib
 Group: System Environment/Libraries
 Summary: The Red Hat Cluster libraries
+Requires: udev
 Conflicts: cman < 3.0.3-1
 Provides: cmanlib = %{version}
 Obsoletes: cmanlib < 3.0.0-5.alpha4
@@ -164,7 +166,7 @@ The Red Hat Cluster libraries package
 %files -n clusterlib
 %defattr(-,root,root,-)
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
+/lib/udev/rules.d/*-dlm.rules
 %{_libdir}/libcman.so.*
 %{_libdir}/libccs*.so.*
 %{_libdir}/libdlm*.so.*
@@ -206,6 +208,13 @@ The Red Hat Cluster libraries development package
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Mar  8 2011 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.1.1-1
+- New upstream release
+- spec file update:
+  BuildRequires: dbus-devel
+  clusterlib now Requires: udev and rules are in /lib/udev
+  Drop systemd workaround, now upstream
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index bab3796..74c7326 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3663f080d417d88b5a370aa542ec98c1  cluster-3.1.0.tar.xz
+3f496dbecaea367af5a5e81d2e8dcab8  cluster-3.1.1.tar.xz