diff --git a/.cvsignore b/.cvsignore index 9df06cb..ac5f816 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wireshark-1.2.8.tar.bz2 +wireshark-1.2.9.tar.bz2 diff --git a/sources b/sources index b30d9b0..575851e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a75d4f62317e52b8b39a1e9e37f1553 wireshark-1.2.8.tar.bz2 +a4240c36f1e668d85b703eacb7c0a95e wireshark-1.2.9.tar.bz2 diff --git a/wireshark-1.2.4-filter_null.patch b/wireshark-1.2.4-filter_null.patch deleted file mode 100644 index cadef53..0000000 --- a/wireshark-1.2.4-filter_null.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up wireshark-1.2.4/gtk/filter_autocomplete.c.bckp wireshark-1.2.4/gtk/filter_autocomplete.c ---- wireshark-1.2.4/gtk/filter_autocomplete.c.bckp 2009-11-16 21:30:43.000000000 +0100 -+++ wireshark-1.2.4/gtk/filter_autocomplete.c 2009-12-14 15:51:18.000000000 +0100 -@@ -776,7 +776,9 @@ filter_autocomplete_handle_backspace(Gtk - GtkRequisition requisition; - size_t prefix_len; - gboolean protocols_only = FALSE; -- -+ -+ if (prefix == NULL) return; -+ - /* Delete the last character in the prefix string */ - prefix_len = strlen(prefix)-1; - prefix[prefix_len] = '\0'; diff --git a/wireshark.spec b/wireshark.spec index 0a4d804..891f3f7 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -12,11 +12,11 @@ Summary: Network traffic analyzer Name: wireshark -Version: 1.2.8 +Version: 1.2.9 %if %{svn_version} Release: 0.%{svn_version}%{?dist} %else -Release: 4%{?dist} +Release: 1%{?dist} %endif License: GPL+ Group: Applications/Internet @@ -33,7 +33,6 @@ Source4: wireshark-autoconf.m4 Patch2: wireshark-nfsv4-opts.patch Patch3: wireshark-0.99.7-path.patch Patch4: wireshark-1.1.2-nfs41-backchnl-decode.patch -Patch5: wireshark-1.2.4-filter_null.patch Patch6: wireshark-1.2.4-enable_lua.patch Patch7: wireshark-1.2.8-disable_warning_dialog.patch Patch8: wireshark-1.2.6-nfs40-backchnl-decode.patch @@ -117,7 +116,6 @@ and plugins. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %if %{with_lua} %patch6 -p1 -b .enable_lua @@ -326,6 +324,10 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/idl2wrs %changelog +* Fri Jun 11 2010 Radek Vokal - 1.2.9-1 +- upgrade to 1.2.9 +- see http://www.wireshark.org/docs/relnotes/wireshark-1.2.9.html + * Mon May 17 2010 Radek Vokal - 1.2.8-4 - removing traling bracket from python_sitearch (#592391)