From 526c1ed11d11bd4c6ac22ddd3ba8748d1d627114 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Thu, 11 Oct 2012 11:16:29 +0200
Subject: [PATCH] New upstream release

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 .gitignore    |  1 +
 corosync.spec | 54 ++++++++++++++++++++++++++++++++++++---------------
 sources       |  2 +-
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 03483b0..ebbb6a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ corosync-1.2.7.tar.gz
 /corosync-1.99.9.tar.gz
 /corosync-2.0.0.tar.gz
 /corosync-2.0.1.tar.gz
+/corosync-2.1.0.tar.gz
diff --git a/corosync.spec b/corosync.spec
index 431617d..47261c1 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -13,15 +13,19 @@
 %bcond_without systemd
 %bcond_without nss
 %bcond_without xmlconf
+%bcond_with runautogen
+
+%global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}
+%global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 2.0.1
-Release: 3%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Version: 2.1.0
+Release: 1%{?gitver}%{?dist}
 License: BSD
 Group: System Environment/Base
-URL: http://ftp.corosync.org
-Source0: ftp://ftp:user@ftp.corosync.org/downloads/%{name}-%{version}/%{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz
+URL: http://www.corosync.org/
+Source0: https://github.com/downloads/corosync/corosync/%{name}-%{version}%{?gittarver}.tar.gz
 
 %if 0%{?rhel}
 ExclusiveArch: i686 x86_64
@@ -37,14 +41,14 @@ Obsoletes: cman, clusterlib, clusterlib-devel
 
 # Build bits
 
-%define buildtrunk 0
-%{?_with_buildtrunk: %define buildtrunk 1}
-
 BuildRequires: groff
-BuildRequires: libqb-devel >= 0.13.0
+BuildRequires: libqb-devel >= 0.14.2
 BuildRequires: nss-devel
-%if %{buildtrunk}
-BuildRequires: autoconf automake
+%if %{with runautogen}
+BuildRequires: autoconf automake libtool
+%endif
+%if %{with monitoring}
+BuildRequires: libstatgrab-devel
 %endif
 %if %{with rdma}
 BuildRequires: libibverbs-devel librdmacm-devel
@@ -57,6 +61,9 @@ BuildRequires: dbus-devel
 %endif
 %if %{with systemd}
 BuildRequires: systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 %endif
 %if %{with xmlconf}
 Requires: libxslt
@@ -65,10 +72,10 @@ Requires: libxslt
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
-%setup -q -n %{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
+%setup -q -n %{name}-%{version}%{?gittarver}
 
 %build
-%if %{buildtrunk}
+%if %{with runautogen}
 ./autogen.sh
 %endif
 
@@ -115,12 +122,13 @@ make install DESTDIR=%{buildroot}
 
 %if %{with dbus}
 mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
-install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
+install -m 644 %{_builddir}/%{name}-%{version}%{?gittarver}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
 %endif
 
 ## tree fixup
 # drop static libs
 rm -f %{buildroot}%{_libdir}/*.a
+rm -f %{buildroot}%{_libdir}/*.la
 # drop docs and html docs for now
 rm -rf %{buildroot}%{_docdir}/*
 
@@ -132,15 +140,28 @@ This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 
 %post
+%if %{with systemd} && 0%{?systemd_post:1}
+%systemd_post corosync.service
+%else
 if [ $1 -eq 1 ]; then
 	/sbin/chkconfig --add corosync || :
 fi
+%endif
 
 %preun
+%if %{with systemd} && 0%{?systemd_preun:1}
+%systemd_preun corosync.service
+%else
 if [ $1 -eq 0 ]; then
 	/sbin/service corosync stop &>/dev/null || :
 	/sbin/chkconfig --del corosync || :
 fi
+%endif
+
+%postun
+%if %{with systemd} && 0%{?systemd_postun:1}
+%systemd_postun
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -149,7 +170,6 @@ fi
 %{_sbindir}/corosync-keygen
 %{_sbindir}/corosync-cmapctl
 %{_sbindir}/corosync-cfgtool
-%{_sbindir}/corosync-fplay
 %{_sbindir}/corosync-cpgtool
 %{_sbindir}/corosync-quorumtool
 %{_sbindir}/corosync-notifyd
@@ -191,7 +211,6 @@ fi
 %{_mandir}/man8/corosync-keygen.8*
 %{_mandir}/man8/corosync-cfgtool.8*
 %{_mandir}/man8/corosync-cpgtool.8*
-%{_mandir}/man8/corosync-fplay.8*
 %{_mandir}/man8/corosync-notifyd.8*
 %{_mandir}/man8/corosync-quorumtool.8*
 %{_mandir}/man5/corosync.conf.5*
@@ -206,7 +225,7 @@ fi
 Summary: The Corosync Cluster Engine Test Agents
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libqb >= 0.10.1
+Requires: libqb >= 0.14.2
 
 %description -n corosync-testagents
 This package contains corosync test agents.
@@ -299,6 +318,9 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/quorum_overview.8*
 
 %changelog
+* Thu Oct 11 2012 Jan Friesse <jfriesse@redhat.com> - 2.1.0-1
+- New upstream release
+
 * Fri Aug 3 2012 Steven Dake <sdake@redhat.com> - 2.0.1-3
 - add groff as a BuildRequires as it is no longer installed in the buildroot
 
diff --git a/sources b/sources
index 5775d31..bd85612 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e23f3f5594676455ff39ff363658155  corosync-2.0.1.tar.gz
+dc5152e6dfdb4638ab544e587884483a  corosync-2.1.0.tar.gz