diff --git a/pacemaker.spec b/pacemaker.spec index b2cdbb5..d335b39 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -13,12 +13,12 @@ ## Upstream pacemaker version, and its package version (specversion ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) -%global pcmkversion 2.0.2 +%global pcmkversion 2.0.3 %global specversion 1 ## Upstream commit (or git tag, such as "Pacemaker-" plus the ## {pcmkversion} macro for an official release) to use for this package -%global commit Pacemaker-2.0.2 +%global commit Pacemaker-2.0.3 ## Since git v2.11, the extent of abbreviation is autoscaled by default ## (used to be constant of 7), so we need to convey it for non-tags, too. %global commit_abbrev 9 @@ -357,7 +357,7 @@ monitor resources. # Early versions of autotools (e.g. RHEL <= 5) do not support --docdir export docdir=%{pcmk_docdir} -export systemdunitdir=%{?_unitdir}%{!?_unitdir:no} +export systemdsystemunitdir=%{?_unitdir}%{!?_unitdir:no} %if %{with hardening} # prefer distro-provided hardening flags in case they are defined @@ -373,8 +373,11 @@ export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}" ./autogen.sh +# Rawhide glibc doesn't like ftime at all +export CPPFLAGS="-UPCMK_TIME_EMERGENCY_CGT $CPPFLAGS" + %{configure} \ - %{?python_path: PYTHON=%{python_path}} \ + PYTHON=%{python_path} \ %{!?with_hardening: --disable-hardening} \ %{!?with_legacy_links: --disable-legacy-links} \ %{?with_profiling: --with-profiling} \ @@ -382,6 +385,7 @@ export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}" %{!?with_doc: --with-brand=} \ %{?gnutls_priorities: --with-gnutls-priorities="%{gnutls_priorities}"} \ --with-initdir=%{_initrddir} \ + --with-runstatedir=%{_rundir} \ --localstatedir=%{_var} \ --with-version=%{version}-%{release} \ --with-bug-url=https://bugz.fedoraproject.org/%{name} \ @@ -389,7 +393,7 @@ export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}" --with-nagios-metadata-dir=%{_datadir}/pacemaker/nagios/plugins-metadata/ \ --with-nagios-plugin-dir=%{_libdir}/nagios/plugins/ -make %{_smp_mflags} V=1 all +make %{_smp_mflags} V=1 %check { cts/cts-scheduler --run load-stopped-loop \ @@ -429,7 +433,6 @@ find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f # Do not package these either rm -f %{buildroot}/%{_sbindir}/fence_legacy rm -f %{buildroot}/%{_mandir}/man8/fence_legacy.* -find %{buildroot} -name 'o2cb*' -type f -print0 | xargs -0 rm -f # For now, don't package the servicelog-related binaries built only for # ppc64le when certain dependencies are installed. If they get more exercise by @@ -701,6 +704,7 @@ exit 0 %{_datadir}/pacemaker/*.rng %{_datadir}/pacemaker/*.xsl %{_datadir}/pacemaker/api +%{_datadir}/pkgconfig/pacemaker-schemas.pc %files nagios-plugins-metadata %dir %{_datadir}/pacemaker/nagios @@ -709,6 +713,11 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Mon Jan 06 2019 Jan Pokorný - 2.0.3-1 +- Update for new upstream tarball: Pacemaker-2.0.3, + for full details, see included ChangeLog file or + https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.0.3 + * Fri Jun 07 2019 Jan Pokorný - 2.0.2-1 - Update for new upstream tarball: Pacemaker-2.0.2, for full details, see included ChangeLog file or diff --git a/sources b/sources index 998a271..dfdffcc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pacemaker-2.0.2.tar.gz) = e23f38e02aea0aefdfff44a61036397882bf4019e32b5f7e24f2b53af9454e4dbd4b52879134d5005f6754fdde9f2391dcc6fb51d3142b92ec2444295d4bd544 +SHA512 (pacemaker-2.0.3.tar.gz) = 957af652c07019cdd1bffaf6c5550de0dc6148c9cb2ef485e091c40bed8f60be86c0950917903d2b44c251a87f170258d0c79a2cf2d989cc1a47ddd5c79be9c2 SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad