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

Add missing incons to filelist

Browse Source 
Fix some rpmlint warnings, mainly mixed spaces and tabs.
This commit is contained in:
Jan Safranek 2010-10-22 12:00:02 +02:00
parent 6e286a2ec3
commit 9db68dbef1
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
wireshark.spec
View File

@ -10,16 +10,16 @@
%define with_portaudio 1 %define with_portaudio 1
%endif %endif
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.4.1 Version: 1.4.1
%if %{svn_version} %if %{svn_version}
Release: 0.%{svn_version}%{?dist} Release: 0.%{svn_version}%{?dist}
%else %else
Release: 1%{?dist} Release: 1%{?dist}
%endif %endif
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
%if %{svn_version} %if %{svn_version}
# svn export http://anonsvn.wireshark.org/wireshark/trunk wireshark-%{version}-SVN-%{svn_version} # svn export http://anonsvn.wireshark.org/wireshark/trunk wireshark-%{version}-SVN-%{svn_version}
Source0: http://www.wireshark.org/download/automated/src/wireshark-%{version}-SVN-%{svn_version}.tar.bz2 Source0: http://www.wireshark.org/download/automated/src/wireshark-%{version}-SVN-%{svn_version}.tar.bz2
@ -44,25 +44,25 @@ Patch5: wireshark-libtool-pie.patch
Patch6: wireshark-1.4.0-python.patch Patch6: wireshark-1.4.0-python.patch
Patch7: wireshark-1.4.0-doc-path.patch Patch7: wireshark-1.4.0-doc-path.patch
Url: http://www.wireshark.org/ Url: http://www.wireshark.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpcap-devel >= 0.9 BuildRequires: libpcap-devel >= 0.9
BuildRequires: libsmi-devel BuildRequires: libsmi-devel
BuildRequires: zlib-devel, bzip2-devel BuildRequires: zlib-devel, bzip2-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: glib2-devel, gtk2-devel BuildRequires: glib2-devel, gtk2-devel
BuildRequires: elfutils-devel, krb5-devel BuildRequires: elfutils-devel, krb5-devel
BuildRequires: python, pcre-devel, libselinux BuildRequires: python, pcre-devel, libselinux
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
BuildRequires: desktop-file-utils, automake, libtool BuildRequires: desktop-file-utils, automake, libtool
BuildRequires: xdg-utils BuildRequires: xdg-utils
BuildRequires: flex, bison, python BuildRequires: flex, bison, python
BuildRequires: GeoIP-devel BuildRequires: GeoIP-devel
%if %{with_adns} %if %{with_adns}
BuildRequires: adns-devel BuildRequires: adns-devel
%endif %endif
%if %{with_portaudio} %if %{with_portaudio}
BuildRequires: portaudio-devel BuildRequires: portaudio-devel
%endif %endif
%if %{with_lua} %if %{with_lua}
BuildRequires: lua-devel BuildRequires: lua-devel
@ -71,7 +71,7 @@ BuildRequires: lua-devel
%package gnome %package gnome
Summary: Gnome desktop integration for wireshark and wireshark-usermode Summary: Gnome desktop integration for wireshark and wireshark-usermode
Group: Applications/Internet Group: Applications/Internet
Requires: gtk2 Requires: gtk2
Requires: usermode >= 1.37 Requires: usermode >= 1.37
Requires: wireshark = %{version}-%{release} Requires: wireshark = %{version}-%{release}
Requires: xdg-utils, usermode-gtk Requires: xdg-utils, usermode-gtk
@ -84,9 +84,9 @@ Requires: portaudio
%endif %endif
%package devel %package devel
Summary: Development headers and libraries for wireshark Summary: Development headers and libraries for wireshark
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version} glibc-devel glib2-devel Requires: %{name} = %{version} glibc-devel glib2-devel
%description %description
@ -186,10 +186,10 @@ ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/wireshark
mkdir -p $RPM_BUILD_ROOT%{python_sitearch} mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
install -m 644 tools/wireshark_be.py tools/wireshark_gen.py $RPM_BUILD_ROOT%{python_sitearch} install -m 644 tools/wireshark_be.py tools/wireshark_gen.py $RPM_BUILD_ROOT%{python_sitearch}
desktop-file-install --vendor fedora \ desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \ --add-category X-Fedora \
%{SOURCE3} %{SOURCE3}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -m 644 image/wsicon48.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/wireshark.png install -m 644 image/wsicon48.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/wireshark.png
@ -260,8 +260,8 @@ touch --no-create %{_datadir}/icons/gnome || :
update-desktop-database &> /dev/null ||: update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || : update-mime-database %{_datadir}/mime &> /dev/null || :
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/gnome || : touch --no-create %{_datadir}/icons/gnome || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
fi fi
%files %files
@ -302,6 +302,11 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/applications/fedora-wireshark.desktop %{_datadir}/applications/fedora-wireshark.desktop
%{_datadir}/pixmaps/wireshark.png %{_datadir}/pixmaps/wireshark.png
%{_datadir}/icons/gnome/16x16/mimetypes/application-x-pcap.png
%{_datadir}/icons/gnome/32x32/mimetypes/application-x-pcap.png
%{_datadir}/icons/gnome/48x48/mimetypes/application-x-pcap.png
%{_datadir}/icons/gnome/256x256/mimetypes/application-x-pcap.png
%{_datadir}/mime/packages/wireshark.xml
%{_bindir}/wireshark %{_bindir}/wireshark
%{_sbindir}/wireshark %{_sbindir}/wireshark
%{_mandir}/man1/wireshark.* %{_mandir}/man1/wireshark.*