From 64e30d76c247c8ceeca7356ce0639162e95be310 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 20 Oct 2017 16:35:57 +0200 Subject: [PATCH] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 23 +++++++++++++++++------ sources | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 59db94b..bad6b37 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ corosync-1.2.7.tar.gz /corosync-2.4.0.tar.gz /corosync-2.4.1.tar.gz /corosync-2.4.2.tar.gz +/corosync-2.4.3.tar.gz diff --git a/corosync.spec b/corosync.spec index bf1ed98..a147d78 100644 --- a/corosync.spec +++ b/corosync.spec @@ -16,14 +16,15 @@ %bcond_without runautogen %bcond_without qdevices %bcond_without qnetd +%bcond_without libcgroup %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.4.2 -Release: 7%{?gitver}%{?dist} +Version: 2.4.3 +Release: 1%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -34,7 +35,8 @@ ExclusiveArch: i686 x86_64 %endif # Runtime bits -Requires: corosynclib = %{version}-%{release} +# The automatic dependency overridden in favor of explicit version lock +Requires: corosynclib%{?_isa} = %{version}-%{release} Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -77,6 +79,9 @@ Requires: nss-tools %if %{with qnetd} BuildRequires: sed %endif +%if %{with libcgroup} +BuildRequires: libcgroup-devel +%endif BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -127,6 +132,9 @@ export rdmacm_LIBS=-lrdmacm \ %endif %if %{with qnetd} --enable-qnetd \ +%endif +%if %{with libcgroup} + --enable-libcgroup \ %endif --with-initddir=%{_initrddir} \ --with-systemddir=%{_unitdir} \ @@ -302,7 +310,6 @@ This package contains corosync test agents. %package -n corosynclib Summary: The Corosync Cluster Engine Libraries Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} %description -n corosynclib This package contains corosync libraries. @@ -326,7 +333,7 @@ This package contains corosync libraries. %package -n corosynclib-devel Summary: The Corosync Cluster Engine Development Kit Group: Development/Libraries -Requires: corosynclib = %{version}-%{release} +Requires: corosynclib%{?_isa} = %{version}-%{release} Requires: pkgconfig Provides: corosync-devel = %{version} Obsoletes: corosync-devel < 0.92-7 @@ -380,7 +387,8 @@ The Corosync Cluster Engine APIs. Summary: The Corosync Cluster Engine Qdevice Group: System Environment/Base Requires: %{name} = %{version}-%{release} -Requires: corosynclib = %{version}-%{release} +# The automatic dependency overridden in favor of explicit version lock +Requires: corosynclib%{?_isa} = %{version}-%{release} Requires: nss-tools %if %{with systemd} @@ -510,6 +518,9 @@ fi %endif %changelog +* Fri Oct 20 2017 Jan Friesse - 2.4.3-1 +- New upstream release + * Mon Oct 09 2017 Troy Dawson - 2.4.2-7 - Cleanup spec file conditionals diff --git a/sources b/sources index 96f2148..acca7c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -547fa78704da53aa35912be58d31035f corosync-2.4.2.tar.gz +SHA512 (corosync-2.4.3.tar.gz) = 3e07da606c7004846739ab9b3446a75e5026158f731e68c671716ead7c370f9d7d97bd3ace94bc3cc52144b39da96dc3cb1882fca743ac4a771b911415b3d5b2