aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-01-11 22:34:03 +0000
committerGerald Combs <gerald@wireshark.org>2019-01-14 17:41:43 +0000
commit290214adc986cc5f8bbbf87df023c290f32d982d (patch)
tree40d237c5aa4f59d18d0293d705d145ba803e7260 /packaging/rpm
parentc3d198c401d5ec17289159cc88e2f891070e7779 (diff)
tarball+RPM: Fetch our version from CMake.
Move git-export-release.sh to packaging/source. Have the source and RPM packaging derive version information from CMake's VERSION variable. This brings them in line with the rest of our packaging and avoids having to read chicken entrails^W^Wgit output. Make sure we always generate wireshark.spec. Bug: 15359 Change-Id: I188efda489c94449a10a612abebf9c2872c305cb Reviewed-on: https://code.wireshark.org/review/31504 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/wireshark.spec.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index 066437ce7f..a9c391fb4d 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -3,7 +3,6 @@
# says that recent CMake versions take care of rpathification.
# To do:
-# - Find a better way to sync with git-export-release.sh.
# - Set version in version.h
# - Add bcond_with clang
@@ -32,7 +31,7 @@
# are set.
%global use_wireshark_group 1
-%global package_version @_git_description@
+%global package_version @VERSION@
Summary: Wireshark is the world's foremost protocol analyzer