From 074d02a645e30ee0c1be583337d8992a4970c454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Thu, 19 Oct 2017 19:01:33 +0200 Subject: [PATCH 1/5] 2.4.2-6 - Rebuilt to solve corosync libraries built with MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... work-in-progress fix in libqb so as to re-establishing compatibility with ld from binutils 2.29 unusuable on powerpc platforms for further link (rhbz#1487787) Signed-off-by: Jan Pokorný --- corosync.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index e281afb..a0c501a 100644 --- a/corosync.spec +++ b/corosync.spec @@ -23,7 +23,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.4.2 -Release: 5%{?gitver}%{?dist} +Release: 6%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -510,6 +510,11 @@ fi %endif %changelog +* 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-establishing compatibility with ld from binutils 2.29 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) From 5bc1b1b270d951e29b0c5ae761960b6dc97e8391 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 20 Oct 2017 17:05:37 +0200 Subject: [PATCH 2/5] 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 a0c501a..c422872 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: 6%{?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 + * 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-establishing compatibility with ld from binutils 2.29 unusuable 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 From 68a4b94012c474bb825991d496a543c81ffb1e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Tue, 24 Oct 2017 21:34:36 +0200 Subject: [PATCH 3/5] Re 2.4.2-6: fix typo in changelog entry (in case of more f27 updates) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Pokorný --- corosync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index c422872..1fa87cf 100644 --- a/corosync.spec +++ b/corosync.spec @@ -523,7 +523,7 @@ fi * 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-establishing compatibility with ld from binutils 2.29 unusuable + 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 From 4418e689985c6010f1a0909841dbbf3de609568b Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 26 Oct 2017 08:45:51 +0200 Subject: [PATCH 4/5] Rebuild for new libqb Signed-off-by: Jan Friesse --- corosync.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 1fa87cf..8e43678 100644 --- a/corosync.spec +++ b/corosync.spec @@ -24,7 +24,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.4.3 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -518,6 +518,9 @@ fi %endif %changelog +* 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 From c11df91de9744093015c94897078e252af5b128f Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 12 Apr 2018 13:26:33 +0200 Subject: [PATCH 5/5] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 13 ++++++------- sources | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index bad6b37..c48cd9d 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ corosync-1.2.7.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 8e43678..6e3a98e 100644 --- a/corosync.spec +++ b/corosync.spec @@ -23,8 +23,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.4.3 -Release: 2%{?gitver}%{?dist} +Version: 2.4.4 +Release: 1%{?gitver}%{?dist} License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -138,8 +138,7 @@ export rdmacm_LIBS=-lrdmacm \ %endif --with-initddir=%{_initrddir} \ --with-systemddir=%{_unitdir} \ - --with-upstartdir=%{_sysconfdir}/init \ - --with-tmpfilesdir=%{_tmpfilesdir} + --with-upstartdir=%{_sysconfdir}/init make %{_smp_mflags} @@ -180,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 @@ -508,7 +505,6 @@ fi %{_unitdir}/corosync-qnetd.service %dir %{_datadir}/corosync %{_datadir}/corosync/corosync-qnetd -%{_tmpfilesdir}/corosync-qnetd.conf %else %{_initrddir}/corosync-qnetd %endif @@ -518,6 +514,9 @@ 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 diff --git a/sources b/sources index acca7c2..8dc0c0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.4.3.tar.gz) = 3e07da606c7004846739ab9b3446a75e5026158f731e68c671716ead7c370f9d7d97bd3ace94bc3cc52144b39da96dc3cb1882fca743ac4a771b911415b3d5b2 +SHA512 (corosync-2.4.4.tar.gz) = df1bc0a452601cd8b6509d2be300c6c5a1906795a429e42718a8c07b82d86c2e973dd8a08b8b2a8cbdbef5c782a2e7881deeb983ce9c221712f7dda2233a4a99