OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   25-Jul-2003 16:11:54
  Branch: HEAD                             Handle: 2003072515115202

  Modified files:
    openpkg-src/fsl         fsl.spec
    openpkg-web             news.txt

  Log:
    quick and dirty rename of pcre symbols to avoid link conflicts

  Summary:
    Revision    Changes     Path
    1.49        +6  -1      openpkg-src/fsl/fsl.spec
    1.5810      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/fsl/fsl.spec
  ============================================================================
  $ cvs diff -u -r1.48 -r1.49 fsl.spec
  --- openpkg-src/fsl/fsl.spec  21 Jul 2003 08:12:31 -0000      1.48
  +++ openpkg-src/fsl/fsl.spec  25 Jul 2003 14:11:54 -0000      1.49
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT-style
   Version:      1.2.0
  -Release:      20030721
  +Release:      20030725
   
   #   package options
   %option       with_fsl_debuglogcode   no
  @@ -63,6 +63,11 @@
   
   %prep
       %setup -q
  +    %{l_shtool} subst \
  +        -e 's;pcre;fsl_pcre;g' \
  +        -e '/#include/s;fsl_pcre;pcre;g' \
  +        *.[ch] \
  +        lib_pcre/*.[ch]
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5809 -r1.5810 news.txt
  --- openpkg-web/news.txt      25 Jul 2003 13:59:40 -0000      1.5809
  +++ openpkg-web/news.txt      25 Jul 2003 14:11:52 -0000      1.5810
  @@ -1,3 +1,4 @@
  +25-Jul-2003: Upgraded package: P<fsl-1.2.0-20030725>
   25-Jul-2003: Upgraded package: P<openldap-2.1.22-20030725>
   25-Jul-2003: Upgraded package: P<dhcp-agent-0.41-20030725>
   25-Jul-2003: Upgraded package: P<bash-2.05b-20030725>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to