diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2006-08-10 12:29:21 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2006-08-10 12:29:21 +0000 |
| commit | f1803c788e6f40ee5d90333c83119c98daeb4a5d (patch) | |
| tree | 38923334e860c22e70f156160315e29fc91703f9 /packaging/rpm | |
| parent | c41a346570020cdf0e1af65aea633963696588d0 (diff) | |
| download | wireshark-f1803c788e6f40ee5d90333c83119c98daeb4a5d.tar.gz | |
As reported by Chris Maynard:
wireshark was located in /usr/X11R6/bin while dumpcap
int /usr/bin. That way wireshark couldn't find dumpcap.
Install wireshark in the same path as dumpcap and tshark.
svn path=/trunk/; revision=18874
Diffstat (limited to 'packaging/rpm')
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 1afa6d5b44..1a3a29d833 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -1,6 +1,6 @@ # Note that this is NOT a relocatable package %define ver @VERSION@ -%define rel 1 +%define rel 2 %define prefix /usr Summary: Network protocol analyzer @@ -34,9 +34,6 @@ make %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT%prefix/X11R6/bin $RPM_BUILD_ROOT%prefix/X11R6/man/man1 -mv $RPM_BUILD_ROOT%prefix/bin/wireshark $RPM_BUILD_ROOT%prefix/X11R6/bin/wireshark -mv $RPM_BUILD_ROOT%prefix/man/man1/wireshark.1* $RPM_BUILD_ROOT%prefix/X11R6/man/man1/ %clean rm -rf $RPM_BUILD_ROOT @@ -44,8 +41,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README* -%prefix/X11R6/bin/* -%prefix/X11R6/man/*/* %prefix/bin/* %prefix/lib/* %prefix/share/wireshark/* @@ -53,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT %prefix/man/*/* %changelog +* Thu Aug 10 2006 Joerg Mayer +- Starting with X.org 7.x X11R6 is being phased out. Install wireshark + and manpage into the standard path. + * Mon Aug 01 2005 Gerald Combs - Add a desktop file and icon for future use |