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

Merge branch 'f17'

Browse Source 
Conflicts:
	wireshark.spec
This commit is contained in:
Jan Safranek 2012-03-28 09:43:23 +02:00
commit a5eec8b4c9
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ wireshark-1.2.10.tar.bz2
/wireshark-1.6.3.tar.bz2 /wireshark-1.6.3.tar.bz2
/wireshark-1.6.4.tar.bz2 /wireshark-1.6.4.tar.bz2
/wireshark-1.6.5.tar.bz2 /wireshark-1.6.5.tar.bz2
/wireshark-1.6.6.tar.bz2

2
sources
View File

@ -1 +1 @@
794948a10d387fc8e37d824ea11dbac9 wireshark-1.6.5.tar.bz2 61145ccd7684b3cfb159fc902fedfecf wireshark-1.6.6.tar.bz2

7
wireshark.spec
View File

@ -10,7 +10,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.6.5 Version: 1.6.6
Release: 2%{?dist} Release: 2%{?dist}
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
@ -340,6 +340,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_sbindir}/idl2wrs %{_sbindir}/idl2wrs
%changelog %changelog
* Wed Mar 28 2012 Jan Safranek <jsafrane@redhat.com> - 1.6.6-1
- upgrade to 1.6.6
- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.6.html
* Fri Mar 9 2012 Jan Safranek <jsafrane@redhat.com> - 1.6.5-2 * Fri Mar 9 2012 Jan Safranek <jsafrane@redhat.com> - 1.6.5-2
- fixed wireshark crashing when using combo box in import dialog (#773290) - fixed wireshark crashing when using combo box in import dialog (#773290)
- added AES support into netlogon dissector - added AES support into netlogon dissector
@ -381,6 +385,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- upgrade to 1.6.2 - upgrade to 1.6.2
- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.2.html - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.2.html
* Thu Jul 21 2011 Jan Safranek <jsafrane@redhat.com> - 1.6.1-1 * Thu Jul 21 2011 Jan Safranek <jsafrane@redhat.com> - 1.6.1-1
- upgrade to 1.6.1 - upgrade to 1.6.1
- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.1.html - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.1.html