diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-12-12 15:06:07 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-12-12 15:06:39 -0600 |
| commit | 471375a3e1007f43d65149c966415d5055daf9da (patch) | |
| tree | bf4dd6aaf6d48c745c153cf3453e122f8fb93d31 | |
| parent | fa6a9e9dbf1dec4c0a4ead925b8feb4218e0bfd9 (diff) | |
| download | NetworkManager-471375a3e1007f43d65149c966415d5055daf9da.tar.gz | |
release: remove "nano" version
Now that NM is >= 1.0 there is no need for a "nano" version.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rwxr-xr-x | contrib/fedora/rpm/build.sh | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 5f57c418ba..9cfe2af355 100644 --- a/configure.ac +++ b/configure.ac @@ -4,9 +4,8 @@ dnl The NM version number m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [1]) m4_define([nm_micro_version], [0]) -m4_define([nm_nano_version], [0]) m4_define([nm_version], - [nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version]) + [nm_major_version.nm_minor_version.nm_micro_version]) m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) AC_INIT([NetworkManager], [nm_version], diff --git a/contrib/fedora/rpm/build.sh b/contrib/fedora/rpm/build.sh index e3c7cd5c10..8e6539dcb1 100755 --- a/contrib/fedora/rpm/build.sh +++ b/contrib/fedora/rpm/build.sh @@ -24,14 +24,14 @@ abs_path() { } get_version() { - local major minor micro nano + local major minor micro local F="${1:-"$GITDIR/configure.ac"}" - vars="$(sed -n 's/^m4_define(\[nm_\(major\|minor\|micro\|nano\)_version\], *\[\([0-9]\+\)\]) *$/local \1='\''\2'\''/p' "$F" 2>/dev/null)" + vars="$(sed -n 's/^m4_define(\[nm_\(major\|minor\|micro\)_version\], *\[\([0-9]\+\)\]) *$/local \1='\''\2'\''/p' "$F" 2>/dev/null)" eval "$vars" - [[ -n "$major" && -n "$minor" && "$micro" && "$nano" ]] || return 1 - echo "$major.$minor.$micro.$nano" + [[ -n "$major" && -n "$minor" && "$micro" ]] || return 1 + echo "$major.$minor.$micro" } write_changelog() { |