diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-07-01 17:22:46 -0400 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-07-01 22:30:48 +0000 |
| commit | 44b8729a0ce41d322858f0cc03b714c80f78c04e (patch) | |
| tree | 53b3ae1fdedfc2203c0d1f8f352cdaacf2f33b18 /packaging | |
| parent | 5d2747c3cff7c030f1b72726907103d6b097f74c (diff) | |
| download | wireshark-44b8729a0ce41d322858f0cc03b714c80f78c04e.tar.gz | |
Fix buildroot.
Change-Id: I902db6c69ae5966da1102e4fbcfd9f46867c0b4f
Reviewed-on: https://code.wireshark.org/review/2762
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
(cherry picked from commit 5f682f1f0329d65edbb363d7db1df23840d38d83)
Reviewed-on: https://code.wireshark.org/review/2764
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index ad292122eb..ae233ec505 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -33,11 +33,12 @@ Source: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 # Or this URL for automated builds: #Source: http://wireshark.org/download/automated/src/%{name}-%{version}.tar.bz2 URL: http://www.wireshark.org/ -BuildRoot: /tmp/wireshark-%{PACKAGE_VERSION}-root Packager: Gerald Combs <gerald[AT]wireshark.org> # Some distributions create a wireshark-devel package; get rid of it Obsoletes: wireshark-devel +BuildRoot: /tmp/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildRequires: autoconf >= @AC_MIN_VERSION@ BuildRequires: automake BuildRequires: libtool @@ -365,7 +366,7 @@ gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || : - Make it possible to not build the GNOME package. * Tue Nov 12 2013 Jeff Morriss -- Add q qt package using 'alternatives' to allow the administrator to choose +- Add a qt package using 'alternatives' to allow the administrator to choose which one they actually use. * Fri Sep 20 2013 Jeff Morriss |