OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Jan-2006 10:39:09
Branch: HEAD Handle: 2006012609390900
Modified files:
openpkg-src/ethereal ethereal.patch ethereal.spec
Log:
fix building by executing make-reg-dotc via /bin/sh explicitly
(alternatively we could make it executable)
Summary:
Revision Changes Path
1.16 +9 -3 openpkg-src/ethereal/ethereal.patch
1.61 +1 -1 openpkg-src/ethereal/ethereal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 ethereal.patch
--- openpkg-src/ethereal/ethereal.patch 13 Jun 2005 18:17:11 -0000
1.15
+++ openpkg-src/ethereal/ethereal.patch 26 Jan 2006 09:39:09 -0000
1.16
@@ -70,9 +70,9 @@
/* confdefs.h. */
_ACEOF
Index: epan/dissectors/Makefile.in
---- epan/dissectors/Makefile.in.orig 2005-05-04 23:32:03 +0200
-+++ epan/dissectors/Makefile.in 2005-06-13 19:46:45 +0200
-@@ -2228,7 +2228,7 @@
+--- epan/dissectors/Makefile.in.orig 2005-12-27 20:26:59 +0100
++++ epan/dissectors/Makefile.in 2006-01-26 10:09:21 +0100
+@@ -2389,12 +2389,12 @@
# All subsequent arguments are the files to scan.
#
register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc
$(srcdir)/make-reg-dotc.py
@@ -81,6 +81,12 @@
echo Making register.c with python ; \
$(PYTHON) $(srcdir)/make-reg-dotc.py $(srcdir) $(DISSECTOR_SRC)
; \
else \
+ echo Making register.c with shell script ; \
+- $(srcdir)/make-reg-dotc register.c $(srcdir) \
++ $(SHELL) $(srcdir)/make-reg-dotc register.c $(srcdir) \
+ $(plugin_src) $(DISSECTOR_SRC) ; \
+ fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
-----------------------------------------------------------------------------
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.spec
============================================================================
$ cvs diff -u -r1.60 -r1.61 ethereal.spec
--- openpkg-src/ethereal/ethereal.spec 1 Jan 2006 13:13:28 -0000
1.60
+++ openpkg-src/ethereal/ethereal.spec 26 Jan 2006 09:39:09 -0000
1.61
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 0.10.14
-Release: 20051228
+Release: 20060126
# package options
%option with_zlib yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
