diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-05-05 21:56:20 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-05-06 15:54:19 +0200 |
| commit | 13ab20fe8ca5069ac5df26e9116322922f66cd9c (patch) | |
| tree | 7a780c177712872796335170b9449773228dead4 /contrib | |
| parent | 831038a5c7c53b83e2fcd06e4913fe0a16942a7f (diff) | |
contrib/rpm: refactor specifying package version in spec file
Similar to what we do for RHEL and Fedora's spec file.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 11 | ||||
| -rwxr-xr-x | contrib/fedora/rpm/build.sh | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index f4c0236b97..8a25690efe 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -30,7 +30,14 @@ %global _hardened_build 1 -%global git_sha_version %{?git_sha:.%{git_sha}} +%if x%{?snapshot} != x +%global snapshot_dot .%{snapshot} +%endif +%if x%{?git_sha} != x +%global git_sha_dot .%{git_sha} +%endif + +%global snap %{?git_sha_dot}%{?snapshot_dot} ############################################################################### @@ -89,7 +96,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: %{epoch_version} Version: %{rpm_version} -Release: %{release_version}%{snapshot}%{git_sha_version}%{?dist} +Release: %{release_version}%{?snap}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ diff --git a/contrib/fedora/rpm/build.sh b/contrib/fedora/rpm/build.sh index 6da1ade3c1..35336bad15 100755 --- a/contrib/fedora/rpm/build.sh +++ b/contrib/fedora/rpm/build.sh @@ -70,7 +70,7 @@ get_version() { write_changelog() { if [[ "x$CHANGELOG" == x ]]; then cat <<- EOF - * $(LC_TIME=C date '+%a %b %d %Y') $USERNAME - %{epoch_version}:%{version}-%{release_version}%{snapshot}%{git_sha_version} + * $(LC_TIME=C date '+%a %b %d %Y') $USERNAME - %{epoch_version}:%{version}-%{release_version}%{?snap} - build of NetworkManager ($DATE, uuid: $UUID, git: $COMMIT_FULL) $(git log -n20 --date=local --format='- %h %s [%an] (%ci)') - ... @@ -163,6 +163,7 @@ sed -e "s/__VERSION__/$VERSION/g" \ -e "s/__RELEASE_VERSION__/$RELEASE_VERSION/g" \ -e "s/__COMMIT__/$COMMIT/g" \ -e "s/__COMMIT_FULL__/$COMMIT_FULL/g" \ + -e "s/__SNAPSHOT__/$SNAPSHOT/g" \ -e "s/__SOURCE1__/$(basename "$SOURCE")/g" \ "$SPECFILE" | sed -e "/^__CHANGELOG__$/ \ |