OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Dec-2004 13:43:21
Branch: HEAD Handle: 2004121612432100
Modified files:
openpkg-src/ethereal ethereal.patch ethereal.spec
Log:
upgrading package: ethereal 0.10.7 -> 0.10.8
Summary:
Revision Changes Path
1.13 +8 -22 openpkg-src/ethereal/ethereal.patch
1.48 +2 -2 openpkg-src/ethereal/ethereal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 ethereal.patch
--- openpkg-src/ethereal/ethereal.patch 23 Oct 2004 10:00:41 -0000
1.12
+++ openpkg-src/ethereal/ethereal.patch 16 Dec 2004 12:43:21 -0000
1.13
@@ -1,28 +1,14 @@
--- gtk/Makefile.in.orig 2004-07-08 00:26:54 +0200
+++ gtk/Makefile.in 2004-07-12 14:09:42 +0200
-@@ -562,13 +562,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)
--doxygen.cfg: $(top_builddir)/config.status doxygen.cfg.in
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
- AR = ar
-
-@@ -775,7 +768,7 @@
+@@ -945,7 +938,7 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: $(LIBRARIES) $(HEADERS)
-
installdirs:
-
+ install: install-am
+ install-exec: install-exec-am
--- gtk/main.c.orig 2004-03-30 10:49:43.000000000 +0200
+++ gtk/main.c 2004-03-30 10:49:49.000000000 +0200
@@ -47,10 +47,7 @@
@@ -54,26 +40,26 @@
+#endif /* #if !defined(__FreeBSD__) */
--- Makefile.in.orig 2004-03-30 14:58:08.000000000 +0200
+++ Makefile.in 2004-03-30 14:58:21.000000000 +0200
-@@ -772,7 +772,6 @@
+@@ -883,7 +883,6 @@
$(ethereal_optional_objects) \
$(ethereal_additional_libs) \
@SNMP_LIBS@ @SSL_LIBS@ \
- $(plugin_ldadd) \
@PCRE_LIBS@ \
- @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@
+ @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@
-@@ -796,7 +795,6 @@
+@@ -907,7 +906,6 @@
$(ethereal_optional_objects) \
$(tethereal_additional_libs) \
@SNMP_LIBS@ @SSL_LIBS@ \
- $(plugin_ldadd) \
@PCRE_LIBS@ \
@GLIB_LIBS@ -lm \
- @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
+ @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@
Index: configure
--- configure.orig 2004-10-21 04:50:23.000000000 +0200
+++ configure 2004-10-23 11:44:44.242378655 +0200
-@@ -15267,6 +15267,9 @@
+@@ -15298,6 +15298,9 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypto $LIBS"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 ethereal.spec
--- openpkg-src/ethereal/ethereal.spec 9 Dec 2004 15:18:57 -0000
1.47
+++ openpkg-src/ethereal/ethereal.spec 16 Dec 2004 12:43:21 -0000
1.48
@@ -33,8 +33,8 @@
Class: EVAL
Group: Network
License: GPL
-Version: 0.10.7
-Release: 20041209
+Version: 0.10.8
+Release: 20041216
# package options
%option with_zlib yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
