[wireshark] added Requires: shadow-utils removed usermode moved Requires: adns to wireshark.rpm
Jan Šafránek
jsafrane at fedoraproject.org
Mon Nov 14 09:22:49 UTC 2011
commit 54caa3db4e79b69d6b2f372913c5412b58cd41f4
Author: Jan Safranek <jsafrane at redhat.com>
Date: Mon Nov 14 10:07:12 2011 +0100
added Requires: shadow-utils
removed usermode
moved Requires: adns to wireshark.rpm
wireshark.pam | 8 --------
wireshark.spec | 26 +++++++++++++-------------
2 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/wireshark.spec b/wireshark.spec
index 977daaa..d18fd3f 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -15,7 +15,6 @@ Release: 1%{?dist}
License: GPL+
Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
-Source1: wireshark.pam
Source2: wireshark.console
Source3: wireshark.desktop
Source4: wireshark-autoconf.m4
@@ -56,18 +55,20 @@ BuildRequires: portaudio-devel
BuildRequires: lua-devel
%endif
+Requires(pre): shadow-utils
+%if %{with_adns}
+Requires: adns
+%endif
+
%package gnome
-Summary: Gnome desktop integration for wireshark and wireshark-usermode
+Summary: Gnome desktop integration for wireshark
Group: Applications/Internet
Requires: gtk2
-Requires: usermode >= 1.37
Requires: wireshark = %{version}-%{release}
-Requires: xdg-utils, usermode-gtk
+Requires: xdg-utils
Requires: GeoIP
-Requires: hicolor-icon-theme
-%if %{with_adns}
-Requires: adns
-%endif
+Requires: hicolor-icon-theme
+
%if %{with_portaudio}
Requires: portaudio
%endif
@@ -159,10 +160,6 @@ perl -pi -e 's|-L../../epan|-L../../epan/.libs|' plugins/*/*.la
make DESTDIR=$RPM_BUILD_ROOT install
-# install support files for usermode, gnome and kde
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/wireshark
-
# Install python stuff.
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
install -m 644 tools/wireshark_be.py tools/wireshark_gen.py $RPM_BUILD_ROOT%{python_sitearch}
@@ -295,7 +292,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man1/rawshark.*
%{_mandir}/man1/dftest.*
%{_mandir}/man1/randpkt.*
-%config(noreplace) %{_sysconfdir}/pam.d/wireshark
%{_datadir}/wireshark
%if %{with_lua}
%exclude %{_datadir}/wireshark/init.lua
@@ -330,6 +326,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_sbindir}/idl2wrs
%changelog
+* Mon Nov 14 2011 Jan Safranek <jsafrane at redhat.com> - 1.6.3-2
+- added dependency on shadow-utils (#753293)
+- removed usermode support
+
* Wed Nov 2 2011 Jan Safranek <jsafrane at redhat.com> - 1.6.3-1
- upgrade to 1.6.3
- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.3.html
More information about the scm-commits
mailing list