From f323f26b93cbb6dc25a4f2f3dae5c78e1d9b9256 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 11 Oct 2012 12:48:37 +0200 Subject: [PATCH 1/4] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 03483b0..5260a53 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.0.2.tar.gz diff --git a/corosync.spec b/corosync.spec index fee0219..88134eb 100644 --- a/corosync.spec +++ b/corosync.spec @@ -20,8 +20,8 @@ Version: 2.0.1 Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?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}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz %if 0%{?rhel} ExclusiveArch: i686 x86_64 @@ -298,6 +298,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/quorum_overview.8* %changelog +* Thu Oct 11 2012 Jan Friesse - 2.0.2-1 +- New upstream release + * Tue May 12 2012 Jan Friesse - 2.0.1-1 - New upstream release diff --git a/sources b/sources index 5775d31..7ecb8c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e23f3f5594676455ff39ff363658155 corosync-2.0.1.tar.gz +b7e4f911ba6d79d4fe55a1906e103ac8 corosync-2.0.2.tar.gz From 613a0de0f6ebd8dc901df06ee741e7f58edfc45f Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 11 Oct 2012 12:49:28 +0200 Subject: [PATCH 2/4] Update version Signed-off-by: Jan Friesse --- corosync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 88134eb..fcaa7e1 100644 --- a/corosync.spec +++ b/corosync.spec @@ -16,7 +16,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: BSD Group: System Environment/Base From bd8e125cbac9fc98edbd4cce2d515920a2267565 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 12 Dec 2012 14:57:31 +0100 Subject: [PATCH 3/4] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5260a53..1249c5f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ corosync-1.2.7.tar.gz /corosync-2.0.0.tar.gz /corosync-2.0.1.tar.gz /corosync-2.0.2.tar.gz +/corosync-2.0.3.tar.gz diff --git a/corosync.spec b/corosync.spec index fcaa7e1..141722d 100644 --- a/corosync.spec +++ b/corosync.spec @@ -16,12 +16,12 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: BSD Group: System Environment/Base URL: http://www.corosync.org/ -Source0: https://github.com/downloads/corosync/corosync/%{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz +Source0: http://corosync.org/download/%{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz %if 0%{?rhel} ExclusiveArch: i686 x86_64 @@ -298,6 +298,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/quorum_overview.8* %changelog +* Wed Dec 12 2012 Jan Friesse - 2.0.3-1 +- New upstream release + * Thu Oct 11 2012 Jan Friesse - 2.0.2-1 - New upstream release diff --git a/sources b/sources index 7ecb8c5..3af0005 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7e4f911ba6d79d4fe55a1906e103ac8 corosync-2.0.2.tar.gz +5cde28a36b0d8ef9b65099b581b5908f corosync-2.0.3.tar.gz From 9bc873b2efd3d55b69549b39de2a235d067c258e Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 18 Jan 2013 12:01:23 +0100 Subject: [PATCH 4/4] New upstream release Also remove hash from macro name in specfile to make rpmlint happy. Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 40 +++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 1249c5f..ac0f3a3 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ corosync-1.2.7.tar.gz /corosync-2.0.1.tar.gz /corosync-2.0.2.tar.gz /corosync-2.0.3.tar.gz +/corosync-2.3.0.tar.gz diff --git a/corosync.spec b/corosync.spec index 141722d..db4d295 100644 --- a/corosync.spec +++ b/corosync.spec @@ -11,17 +11,20 @@ %bcond_without rdma %endif %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.3 -Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Version: 2.3.0 +Release: 1%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://www.corosync.org/ -Source0: http://corosync.org/download/%{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz +Source0: http://corosync.org/download/%{name}-%{version}%{?gittarver}.tar.gz %if 0%{?rhel} ExclusiveArch: i686 x86_64 @@ -37,13 +40,14 @@ Obsoletes: cman, clusterlib, clusterlib-devel # Build bits -%define buildtrunk 0 -%{?_with_buildtrunk: %define buildtrunk 1} - -BuildRequires: libqb-devel >= 0.13.0 +BuildRequires: groff +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 @@ -64,10 +68,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 @@ -114,12 +118,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}/* @@ -148,7 +153,6 @@ fi %{_sbindir}/corosync-keygen %{_sbindir}/corosync-cmapctl %{_sbindir}/corosync-cfgtool -%{_sbindir}/corosync-fplay %{_sbindir}/corosync-cpgtool %{_sbindir}/corosync-quorumtool %{_sbindir}/corosync-notifyd @@ -190,7 +194,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* @@ -205,7 +208,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. @@ -298,6 +301,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/quorum_overview.8* %changelog +* Fri Jan 18 2013 Jan Friesse - 2.3.0-1 +- New upstream release + * Wed Dec 12 2012 Jan Friesse - 2.0.3-1 - New upstream release @@ -416,7 +422,7 @@ The Corosync Cluster Engine APIs. - New upstream release - Use global instead of define - Update Source0 url -- Use more %name macro around +- Use more name macro around - Cleanup install section. Init script is now installed by upstream - Cleanup whitespace - Don't deadlock between package upgrade and corosync condrestart diff --git a/sources b/sources index 3af0005..4b9d54d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5cde28a36b0d8ef9b65099b581b5908f corosync-2.0.3.tar.gz +4689279c36b1417e122a23c6818017dd corosync-2.3.0.tar.gz