rpms/pacemaker
6
0
Fork 0
Code Issues Pull Requests Releases Activity

1.1.16-2.a39ea6491.git - Update for (slightly stabilized) snapshot

Browse Source 
...beyond Pacemaker-1.1.16 (commit a39ea6491), including:
. prevent FTBFS with new GCC 7 (a7476dd96)

Adapt spec file more akin to upstream version including:
. better pre-release vs. tags logic (4581d4366)
This commit is contained in:
Jan Pokorný 2017-02-06 18:39:12 +01:00
parent 518aa2062f
commit 24e2d5eb01
No known key found for this signature in database
GPG Key ID: 61BBB23A9E8F8DE2
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pacemaker.spec
View File

@ -18,12 +18,16 @@
## Upstream commit (or git tag, such as "Pacemaker-" plus the ## Upstream commit (or git tag, such as "Pacemaker-" plus the
## {pcmkversion} macro for an official release) to use for this package ## {pcmkversion} macro for an official release) to use for this package
%global commit Pacemaker-%{pcmkversion} %global commit a39ea6491a6e06b8575e8bb47059d8ff9f3d03e3
## 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
## Nagios source control identifiers ## Nagios source control identifiers
%global nagios_name nagios-agents-metadata %global nagios_name nagios-agents-metadata
%global nagios_hash 105ab8a7b2c16b9a29cf1c1596b80136eeef332b %global nagios_hash 105ab8a7b2c16b9a29cf1c1596b80136eeef332b
# Define globals for convenient use later # Define globals for convenient use later
## Workaround to use parentheses in other globals ## Workaround to use parentheses in other globals
@ -33,13 +37,15 @@
## Short version of git commit ## Short version of git commit
%define shortcommit %(c=%{commit}; case ${c} in %define shortcommit %(c=%{commit}; case ${c} in
Pacemaker-*%{rparen} echo ${c:10};; Pacemaker-*%{rparen} echo ${c:10};;
*%{rparen} echo ${c:0:7};; esac) *%{rparen} echo ${c:0:%{commit_abbrev}};; esac)
## Whether this is a release candidate ## Whether this is a tagged release
%define pre_release %(s=%{shortcommit}; [ ${s: -4:3} != -rc ]; echo $?) %define tag_release %([ %{commit} != Pacemaker-%{shortcommit} ]; echo $?)
## Whether this is a development branch ## Whether this is a release candidate (in case of a tagged release)
%define post_release %([ %{commit} = Pacemaker-%{shortcommit} ]; echo $?) %define pre_release %(s=%{shortcommit}; [ "%{tag_release}" -eq 0 ] || {
case %{s} in *-rc[[:digit:]]*%{rparen} false;;
esac; }; echo $?)
## Turn off auto-compilation of python files outside site-packages directory, ## Turn off auto-compilation of python files outside site-packages directory,
## so that the -libs-devel package is multilib-compliant (no *.py[co] files) ## so that the -libs-devel package is multilib-compliant (no *.py[co] files)
@ -99,17 +105,19 @@
# Define the release version # Define the release version
%if %{with pre_release} || 0%{pre_release} # (do not look at externally enforced pre-release flag for tagged releases
# as only -rc tags, captured with the second condition, implies that then)
%if (!%{tag_release} && %{with pre_release}) || 0%{pre_release}
%if 0%{pre_release} %if 0%{pre_release}
%define pcmk_release 0.%{specversion}.%(s=%{shortcommit}; echo ${s: -3}) %define pcmk_release 0.%{specversion}.%(s=%{shortcommit}; echo ${s: -3})
%else %else
%define pcmk_release 0.%{specversion}.%{shortcommit}.git %define pcmk_release 0.%{specversion}.%{shortcommit}.git
%endif %endif
%else %else
%if 0%{post_release} %if 0%{tag_release}
%define pcmk_release %{specversion}.%{shortcommit}.git
%else
%define pcmk_release %{specversion} %define pcmk_release %{specversion}
%else
%define pcmk_release %{specversion}.%{shortcommit}.git
%endif %endif
%endif %endif
@ -676,6 +684,13 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING %license %{nagios_name}-%{nagios_hash}/COPYING
%changelog %changelog
* Mon Feb 06 2017 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.16-2.a39ea6491.git
- Update for (slightly stabilized) snapshot beyond Pacemaker-1.1.16
(commit a39ea6491), including:
. prevent FTBFS with new GCC 7 (a7476dd96)
- Adapt spec file more akin to upstream version including:
. better pre-release vs. tags logic (4581d4366)
* Fri Dec 02 2016 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.16-1 * Fri Dec 02 2016 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.16-1
- Update for new upstream tarball: Pacemaker-1.1.16, - Update for new upstream tarball: Pacemaker-1.1.16,
for full details, see included ChangeLog file or for full details, see included ChangeLog file or

4
sources
View File

@ -1,2 +1,2 @@
a3b9d075bc9114ff698966e57e50bb12 pacemaker-1.1.16.tar.gz SHA512 (pacemaker-a39ea6491.tar.gz) = 01bfda817790e49966f23cca77df70f5f6bdc2c3b057a2176c4ee722c83b206c378be599a7f006b3617b6260038ac271549a1246de2ff531bd488153a6076846
b914b3c0f16d2ba21339fb54e166500e nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad