new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10719 ec354946-7b23-47d6-9f5a-488ba84defc7

w/wireshark/wireshark-vl.spec

@@ -3,7 +3,7 @@
 Summary: 	Network traffic analyzer
 Summary(ja):    ネットワークトラフィック解析プログラム
 Name: 		wireshark
-Version:	1.12.12
+Version:	2.0.5
 Release: 	1%{_dist_release}
 License: 	GPLv2
 Group: 		Applications/System
@@ -11,7 +11,7 @@ Source0:	http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
 Source1:	wireshark.pam
 Source2:	wireshark.console
 Source3:	wireshark.desktop
-Patch4:         wireshark-0.99.7-path.patch
+Patch4:         wireshark-2.0.5-path.patch
 Patch5:         wireshark-1.10.0-lua-vine.patch
 URL: 		http://www.wireshark.org/
 
@@ -78,6 +78,7 @@ export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -I%{_includedir}/pcre"
 export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
 export LDFLAGS="$LDFLAGS -lm -lcrypto"
 export PATH="$PATH:/usr/kerberos/bin"
+
 ./autogen.sh
 # --disable-warning-as-erros needs for compiling with glib 2.14.0
 %configure \
@@ -125,6 +126,8 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/w
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/wireshark
 
+mv $RPM_BUILD_ROOT/%{_sbindir}/wireshark-gtk $RPM_BUILD_ROOT/%{_sbindir}/wireshark
+
 # install man
 ## mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 ## install -m 644 *.1 $RPM_BUILD_ROOT/%{_mandir}/man1
@@ -161,6 +164,7 @@ update-desktop-database -q
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README* 
+%{_sbindir}/androiddump
 %{_sbindir}/editcap
 %{_sbindir}/tshark
 %{_sbindir}/mergecap
@@ -175,6 +179,7 @@ update-desktop-database -q
 %{_sbindir}/reordercap
 %{python_sitelib}/*
 %{_libdir}/lib*
+%{_mandir}/man1/androiddump.*
 %{_mandir}/man1/editcap.*
 %{_mandir}/man1/tshark.*
 %{_mandir}/man1/mergecap.*
@@ -183,6 +188,9 @@ update-desktop-database -q
 %{_mandir}/man1/dumpcap.*
 %{_mandir}/man1/reordercap.*
 %{_mandir}/man4/wireshark-filter.*
+%{_mandir}/man1/rawshark.*
+%{_mandir}/man1/dftest.*
+%{_mandir}/man1/randpkt.*
 %{_libdir}/wireshark
 %config(noreplace) %{_sysconfdir}/pam.d/wireshark
 %config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
@@ -209,17 +217,22 @@ update-desktop-database -q
 %{_datadir}/%{name}/tpncp
 %{_datadir}/%{name}/wimaxasncp
 
+%{_datadir}/icons/hicolor/*/*/*
+
 %{_datadir}/applications/*.desktop
+%{_datadir}/appdata/wireshark.appdata.xml
+%{_datadir}/mime/packages/wireshark.xml
 %{_datadir}/pixmaps/wireshark.png
 %{_bindir}/wireshark
 %{_sbindir}/wireshark
 %{_mandir}/man1/wireshark.*
-%{_mandir}/man1/rawshark.*
-%{_mandir}/man1/dftest.*
-%{_mandir}/man1/randpkt.*
 
 
 %changelog
+* Sun Jul 31 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.5-1
+- new upstream release
+- update Patch4 (wireshark-2.0.5-path.patch)
+
 * Tue Jun 14 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.12-1
 - new upstream release