diff --git a/SPECS/corosync.spec b/SPECS/corosync.spec index 2ab9bf5..f59fc9c 100644 --- a/SPECS/corosync.spec +++ b/SPECS/corosync.spec @@ -29,7 +29,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.4.3 -Release: 6%{?gitver}%{?dist} +Release: 6%{?gitver}%{?dist}.1 License: BSD Group: System Environment/Base URL: http://corosync.github.io/corosync/ @@ -51,7 +51,7 @@ Patch5: bz1634710-1-totemcrypto-Fix-importing-of-the-private-key.patch Patch6: bz1376819-3-qnetd-Check-existence-of-NSS-DB-dir-before-fork.patch %if 0%{?rhel} -ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %{arm} +ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %endif # Runtime bits @@ -178,13 +178,14 @@ make %{_smp_mflags} %if %{with spausedd} cd spausedd-%{spausedd_version} +CFLAGS="${CFLAGS:-%{optflags}}" ; export CFLAGS make \ %if %{defined use_vmguestlib} WITH_VMGUESTLIB=1 \ %else WITH_VMGUESTLIB=0 \ %endif - %{?_smp_mflags} CFLAGS="%{optflags}" + %{?_smp_mflags} %endif %install @@ -236,7 +237,7 @@ make DESTDIR="%{buildroot}" PREFIX="%{_prefix}" install %if %{with systemd} mkdir -p %{buildroot}/%{_unitdir} -install -m 755 -p init/spausedd.service %{buildroot}/%{_unitdir} +install -m 644 -p init/spausedd.service %{buildroot}/%{_unitdir} %else mkdir -p %{buildroot}/%{_initrddir} install -m 755 -p init/spausedd %{buildroot}/%{_initrddir} @@ -627,6 +628,12 @@ fi %endif %changelog +* Fri Aug 16 2019 Jan Friesse 2.4.3-6.1 +- Resolves: rhbz#1740181 + +- Do not set exec permission for service file +- Fix CFLAGS definition + * Thu Mar 21 2019 Jan Friesse 2.4.3-6 - Resolves: rhbz#1542703