diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 14237285ed..56da2c4270 100644 --- a/configure.ac +++ b/configure.ac @@ -2920,6 +2920,7 @@ else RPMBUILD_WITH_ARGS="$RPMBUILD_WITH_ARGS --without lua" fi AC_SUBST(RPMBUILD_WITH_ARGS) +AC_SUBST(RPM_VERSION, version_major.version_minor.version_micro) AC_SUBST(WS_CPPFLAGS) AC_SUBST(WS_CFLAGS) diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 9a96863e73..952aa620b1 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -22,16 +22,18 @@ # are set. %global use_wireshark_group 1 +%global package_version @VERSION@ + Summary: Wireshark is the world's foremost protocol analyzer Name: wireshark -Version: @VERSION@ +Version: @RPM_VERSION@ Release: 1 License: GPLv2+ Group: Applications/Internet -Source: https://wireshark.org/download/src/%{name}-%{version}.tar.bz2 +Source: https://wireshark.org/download/src/%{name}-%{package_version}.tar.bz2 # Or this URL for automated builds: -#Source: https://wireshark.org/download/automated/src/%{name}-%{version}.tar.bz2 +#Source: https://wireshark.org/download/automated/src/%{name}-%{package_version}.tar.bz2 URL: https://www.wireshark.org/ Packager: Gerald Combs <gerald[AT]wireshark.org> # Some distributions create a wireshark-devel package; get rid of it @@ -214,7 +216,7 @@ This package contains the GTK+ Wireshark GUI and desktop integration files. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{package_version} # Don't specify the prefix here: configure is a macro which expands to set # the prefix and everything else too. If you need to change the prefix |