colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release: remove "nano" version

Browse Source 
Now that NM is >= 1.0 there is no need for a "nano" version.
This commit is contained in:
Dan Williams
2014-12-12 15:06:07 -06:00
parent fa6a9e9dbf
commit 471375a3e1
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -4,9 +4,8 @@ dnl The NM version number
m4_define([nm_major_version], [1]) m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [1]) m4_define([nm_minor_version], [1])
m4_define([nm_micro_version], [0]) m4_define([nm_micro_version], [0])
m4_define([nm_nano_version], [0])
m4_define([nm_version], 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 ])]) 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], AC_INIT([NetworkManager], [nm_version],

8
contrib/fedora/rpm/build.sh
View File

@@ -24,14 +24,14 @@ abs_path() {
} }
get_version() { get_version() {
local major minor micro nano local major minor micro
local F="${1:-"$GITDIR/configure.ac"}" 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" eval "$vars"
[[ -n "$major" && -n "$minor" && "$micro" && "$nano" ]] || return 1 [[ -n "$major" && -n "$minor" && "$micro" ]] || return 1
echo "$major.$minor.$micro.$nano" echo "$major.$minor.$micro"
} }
write_changelog() { write_changelog() {