diff --git a/.gitignore b/.gitignore index 59db94b..c48cd9d 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ 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 +/corosync-2.4.4.tar.gz diff --git a/corosync.spec b/corosync.spec index e281afb..6e3a98e 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: 5%{?gitver}%{?dist} +Version: 2.4.4 +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,11 +132,13 @@ export rdmacm_LIBS=-lrdmacm \ %endif %if %{with qnetd} --enable-qnetd \ +%endif +%if %{with libcgroup} + --enable-libcgroup \ %endif --with-initddir=%{_initrddir} \ --with-systemddir=%{_unitdir} \ - --with-upstartdir=%{_sysconfdir}/init \ - --with-tmpfilesdir=%{_tmpfilesdir} + --with-upstartdir=%{_sysconfdir}/init make %{_smp_mflags} @@ -172,8 +179,6 @@ install -m 644 init/corosync-qnetd.sysconfig.example \ %if %{with systemd} sed -i -e 's/^#User=/User=/' \ %{buildroot}%{_unitdir}/corosync-qnetd.service -sed -i -e 's/root/coroqnetd/g' \ - %{buildroot}%{_tmpfilesdir}/corosync-qnetd.conf %else sed -i -e 's/^COROSYNC_QNETD_RUNAS=""$/COROSYNC_QNETD_RUNAS="coroqnetd"/' \ %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd @@ -302,7 +307,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 +330,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 +384,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} @@ -500,7 +505,6 @@ fi %{_unitdir}/corosync-qnetd.service %dir %{_datadir}/corosync %{_datadir}/corosync/corosync-qnetd -%{_tmpfilesdir}/corosync-qnetd.conf %else %{_initrddir}/corosync-qnetd %endif @@ -510,6 +514,20 @@ fi %endif %changelog +* Thu Apr 12 2018 Jan Friesse - 2.4.4-1 +- New upstream release + +* Thu Oct 26 2017 Jan Friesse - 2.4.3-2 +- Rebuild for new libqb + +* Fri Oct 20 2017 Jan Friesse - 2.4.3-1 +- New upstream release + +* Thu Oct 19 2017 Jan Pokorný - 2.4.2-6 +- Rebuilt to solve corosync libraries built with work-in-progress fix in libqb + so as to re-establish compatibility with ld from binutils 2.29 are unusuable + on powerpc platforms for further link (rhbz#1487787) + * Wed Aug 23 2017 Adam Williamson - 2.4.2-5 - Disable RDMA on 32-bit ARM (#1484155) diff --git a/sources b/sources index 96f2148..8dc0c0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -547fa78704da53aa35912be58d31035f corosync-2.4.2.tar.gz +SHA512 (corosync-2.4.4.tar.gz) = df1bc0a452601cd8b6509d2be300c6c5a1906795a429e42718a8c07b82d86c2e973dd8a08b8b2a8cbdbef5c782a2e7881deeb983ce9c221712f7dda2233a4a99