Changes - j0ke.net Open Build Service

Changes of Revision 10

[-] [+]	Changed	wireshark.spec
@@ -27,8 +27,9 @@ Url: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source1: include.filelist +Source2: wireshark.permissions # PATCH-FIX-OPENSUSE wireshark-1.0.8-desktop.patch bnc#349782 prusnak@suse.cz -- fix icon and run as root -Patch0: %{name}-1.6.3-desktop.patch +#Patch0: %{name}-1.6.3-desktop.patch # PATCH-FIX-OPENSUSE wireshark-1.2.0-disable-warning-dialog.patch bnc#349782 prusnak@suse.cz -- don't show warning when running as root Patch1: %{name}-1.6.0-disable-warning-dialog.patch # PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak@suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders @@ -59,6 +60,8 @@ BuildRequires: tcpd-devel BuildRequires: xdg-utils BuildRequires: zlib-devel +BuildRequires: permissions +Requires: permissions %if 0%{?suse_version} BuildRequires: update-desktop-files BuildRequires: libGeoIP-devel @@ -91,7 +94,6 @@ %prep %setup -q -%patch0 %patch1 %patch2 %patch3 -p1 @@ -114,14 +116,26 @@ done install -D -m 0644 image/wsicon48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/wireshark.png install -D -m 0644 wireshark.desktop $RPM_BUILD_ROOT%{_datadir}/applications/wireshark.desktop +install -D -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfig}/permissions.d/wireshark %if 0%{?suse_version} %suse_update_desktop_file %{name} %endif +%if 0%{?suse_version} >= 1120 +%verifyscript +%verify_permissions -e %{_bindir}/dumpcap +%endif + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +%if 0%{?set_permissions:1} > 0 + %set_permissions %{name} +%else + %run_permissions +%endif %postun -p /sbin/ldconfig @@ -130,6 +144,7 @@ %doc AUTHORS COPYING NEWS README README.linux README.vmware %doc %{_mandir}/man1/[^i]* %doc %{_mandir}/man4/* +%config %{_sysconfig}/permissions.d/wireshark %{_datadir}/applications/wireshark.desktop %{_datadir}/pixmaps/wireshark.png %{_bindir}/[^i]*
[-] [+]	Added	wireshark.permissions ^
@@ -0,0 +1 @@ +/usr/bin/dumpcap root:root 4755