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:   13-Jun-2005 20:17:11
  Branch: HEAD                             Handle: 2005061319171100

  Modified files:
    openpkg-src/ethereal    ethereal.patch ethereal.spec

  Log:
    fix building if Python is not available

  Summary:
    Revision    Changes     Path
    1.15        +12 -0      openpkg-src/ethereal/ethereal.patch
    1.56        +1  -1      openpkg-src/ethereal/ethereal.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ethereal/ethereal.patch
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 ethereal.patch
  --- openpkg-src/ethereal/ethereal.patch       15 May 2005 17:52:01 -0000      
1.14
  +++ openpkg-src/ethereal/ethereal.patch       13 Jun 2005 18:17:11 -0000      
1.15
  @@ -69,6 +69,18 @@
    cat >conftest.$ac_ext <<_ACEOF
    /* 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 @@
  + # All subsequent arguments are the files to scan.
  + #
  + register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc 
$(srcdir)/make-reg-dotc.py
  +-    @if test -n $(PYTHON); then \
  ++    @if test -n "$(PYTHON)"; then \
  +             echo Making register.c with python ; \
  +             $(PYTHON) $(srcdir)/make-reg-dotc.py $(srcdir) $(DISSECTOR_SRC) 
; \
  +     else \
   
   -----------------------------------------------------------------------------
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ethereal/ethereal.spec
  ============================================================================
  $ cvs diff -u -r1.55 -r1.56 ethereal.spec
  --- openpkg-src/ethereal/ethereal.spec        15 May 2005 17:52:01 -0000      
1.55
  +++ openpkg-src/ethereal/ethereal.spec        13 Jun 2005 18:17:11 -0000      
1.56
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      0.10.11
  -Release:      20050515
  +Release:      20050613
   
   #   package options
   %option       with_zlib    yes
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to