rpms/wireshark
7
0
Fork 0
Code Issues Pull Requests Releases Activity

added Requires: shadow-utils

Browse Source 
removed usermode
moved Requires: adns to wireshark.rpm
This commit is contained in:
Jan Safranek 2011-11-14 10:07:12 +01:00
parent f6395b5a6c
commit 54caa3db4e
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wireshark.pam
View File

@ -1,8 +0,0 @@
#%PAM-1.0
auth sufficient pam_rootok.so
#auth sufficient pam_timestamp.so
auth include system-auth
account required pam_permit.so
session required pam_permit.so
session optional pam_xauth.so
#session optional pam_timestamp.so

30
wireshark.spec
View File

@ -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
%package gnome
Summary: Gnome desktop integration for wireshark and wireshark-usermode
Group: Applications/Internet
Requires: gtk2
Requires: usermode >= 1.37
Requires: wireshark = %{version}-%{release}
Requires: xdg-utils, usermode-gtk
Requires: GeoIP
Requires: hicolor-icon-theme
Requires(pre): shadow-utils
%if %{with_adns}
Requires: adns
%endif
%package gnome
Summary: Gnome desktop integration for wireshark
Group: Applications/Internet
Requires: gtk2
Requires: wireshark = %{version}-%{release}
Requires: xdg-utils
Requires: GeoIP
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@redhat.com> - 1.6.3-2
- added dependency on shadow-utils (#753293)
- removed usermode support
* Wed Nov 2 2011 Jan Safranek <jsafrane@redhat.com> - 1.6.3-1
- upgrade to 1.6.3
- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.3.html