rpms/ethereal/FC-4 ethereal-column.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 ethereal.spec, 1.41, 1.42 sources, 1.28, 1.29

[fedora-cvs-commits at redhat.com]

Author: rvokal

Update of /cvs/dist/rpms/ethereal/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv12005

Modified Files:
	.cvsignore ethereal.spec sources 
Added Files:
	ethereal-column.patch 
Log Message:
 - update to 0.99.0
 - fix segfault when rearranging columns



ethereal-column.patch:
 column_prefs.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE ethereal-column.patch ---
--- ethereal-0.99.0-SVN-17918/gtk/column_prefs.c.old	2006-04-20 01:53:02.000000000 +0200
+++ ethereal-0.99.0-SVN-17918/gtk/column_prefs.c	2006-04-25 02:14:52.000000000 +0200
@@ -1,7 +1,7 @@
 /* column_prefs.c
  * Dialog box for column preferences
  *
- * $Id: column_prefs.c 15465 2005-08-20 12:09:48Z ulfl $
+ * $Id: column_prefs.c 17983 2006-04-24 21:27:12Z jake $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald at ethereal.com>
@@ -638,6 +638,7 @@
                 return;
             }
         }
+        clp1 = g_list_find(prefs.col_list, cfmt);
         gtk_tree_model_get(model, &iter2, 0, &title2, 1, &format2, 2,
                            &clp2, -1);
         gtk_list_store_set(GTK_LIST_STORE(model), &iter2, 0, title1, 1,
@@ -645,7 +646,7 @@
         gtk_list_store_set(GTK_LIST_STORE(model), &iter1, 0, title2, 1,
                            format2, 2, clp2, -1);
         gtk_tree_selection_select_iter(sel, &iter2);
-        /* clp1 = g_list_find(prefs.col_list, cfmt); */
+
         column_set_arrow_button_sensitivity(clp1);
 
         /* free strings read from the TreeModel */


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	29 Dec 2005 22:17:26 -0000	1.25
+++ .cvsignore	25 Apr 2006 15:07:25 -0000	1.26
@@ -1 +1 @@
-ethereal-0.10.14.tar.bz2
+ethereal-0.99.0.tar.bz2


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/ethereal.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ethereal.spec	29 Dec 2005 22:17:27 -0000	1.41
+++ ethereal.spec	25 Apr 2006 15:07:25 -0000	1.42
@@ -2,8 +2,8 @@
 
 Summary: 	Network traffic analyzer
 Name: 		ethereal
-Version:	0.10.14
-Release: 	1.FC4.1
+Version:	0.99.0
+Release: 	fc4.1
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 Source3:	ethereal.desktop
 Source4:	ethereal.png
 Patch4:		ethereal-0.10.13-pie.patch
+Patch5:		ethereal-column.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -132,6 +133,7 @@
 %{_sbindir}/dftest
 %{_sbindir}/capinfos
 %{_sbindir}/randpkt
+%{_sbindir}/dumpcap
 %{python_sitelib}/*
 %{_libdir}/lib*
 %{_mandir}/man1/editcap.*
@@ -140,6 +142,7 @@
 %{_mandir}/man1/mergecap.*
 %{_mandir}/man1/text2pcap.*
 %{_mandir}/man1/capinfos.*
+%{_mandir}/man1/dumpcap.*
 %{_mandir}/man4/ethereal-filter.*
 %{_libdir}/ethereal
 %{_sysconfdir}/pam.d/ethereal
@@ -156,6 +159,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Radek Vokál <rvokal at redhat.com> 0.99.0-fc4.1
+- update to 0.99.0
+- fix segfault when rearranging columns
+
 * Thu Dec 29 2005 Radek Vokal <rvokal at redhat.com> 0.10.14-1.FC4.1
 - upgrade to 0.10.14
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ethereal/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	29 Dec 2005 22:17:27 -0000	1.28
+++ sources	25 Apr 2006 15:07:25 -0000	1.29
@@ -1 +1 @@
-297f678c037f88429250830e924b8fa0  ethereal-0.10.14.tar.bz2
+f9905b9d347acdc05af664a7553f7f76  ethereal-0.99.0.tar.bz2