OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Feb-2004 20:31:33
Branch: HEAD Handle: 2004022419313200
Modified files:
openpkg-src/ethereal ethereal.patch ethereal.spec
Log:
upgrading package: ethereal 0.10.0a -> 0.10.2
Summary:
Revision Changes Path
1.6 +30 -5 openpkg-src/ethereal/ethereal.patch
1.34 +3 -3 openpkg-src/ethereal/ethereal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 ethereal.patch
--- openpkg-src/ethereal/ethereal.patch 14 Dec 2003 12:12:03 -0000 1.5
+++ openpkg-src/ethereal/ethereal.patch 24 Feb 2004 19:31:32 -0000 1.6
@@ -1,10 +1,35 @@
---- gtk/main.c.orig Mon Sep 30 08:59:51 2002
-+++ gtk/main.c Mon Sep 30 08:59:38 2002
-@@ -43,6 +43,7 @@
+Index: gtk/Makefile.in
+--- gtk/Makefile.in.orig 2004-02-19 03:40:27.000000000 +0100
++++ gtk/Makefile.in 2004-02-20 14:18:05.000000000 +0100
+@@ -488,11 +488,6 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: Makefile.am $(srcdir)/Makefile.common
$(top_srcdir)/configure.in $(ACLOCAL_M4)
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu gtk/Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
+
+ AR = ar
+
+@@ -680,7 +675,7 @@
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LIBRARIES) $(HEADERS)
++all-am: $(LIBRARIES) $(HEADERS)
+
+ installdirs:
+
+Index: gtk/main.c
+--- gtk/main.c.orig 2004-02-18 01:02:10.000000000 +0100
++++ gtk/main.c 2004-02-20 14:07:28.000000000 +0100
+@@ -47,6 +47,7 @@
#include <string.h>
#include <ctype.h>
+#include <unistd.h>
- #ifdef HAVE_IO_H
- #include <io.h> /* open/close on win32 */
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.spec
============================================================================
$ cvs diff -u -r1.33 -r1.34 ethereal.spec
--- openpkg-src/ethereal/ethereal.spec 20 Feb 2004 14:08:10 -0000 1.33
+++ openpkg-src/ethereal/ethereal.spec 24 Feb 2004 19:31:32 -0000 1.34
@@ -33,8 +33,8 @@
Class: PLUS
Group: Network
License: GPL
-Version: 0.10.0a
-Release: 20040207
+Version: 0.10.2
+Release: 20040224
# package options
%option with_zlib yes
@@ -120,7 +120,7 @@
--without-ssl \
%endif
%if "%{with_snmp}" == "yes"
- --with-net-snmp=%{l_prefix} \
+ --with-net-snmp=%{l_prefix}/bin/net-snmp-config \
%else
--without-net-snmp \
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]