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 openpkg-web          Date:   28-Mar-2003 17:39:03
  Branch: HEAD                             Handle: 2003032816390002

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

  Log:
    fix syntax

  Summary:
    Revision    Changes     Path
    1.15        +1  -1      openpkg-src/teapop/teapop.spec
    1.3875      +0  -3      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/teapop/teapop.spec
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 teapop.spec
  --- openpkg-src/teapop/teapop.spec    28 Mar 2003 14:20:10 -0000      1.14
  +++ openpkg-src/teapop/teapop.spec    28 Mar 2003 16:39:02 -0000      1.15
  @@ -113,7 +113,7 @@
   
       #   Determining installation tree files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
  -        '%config %attr(0600,;%{l_susr},%{l_mgrp}) %{l_prefix}/etc/teapop/*' \
  +        '%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/teapop/*' \
           '%config %{l_prefix}/etc/fsl/fsl.teapop' \
           '%not %dir %{l_prefix}/etc/fsl'
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3874 -r1.3875 news.txt
  --- openpkg-web/news.txt      28 Mar 2003 15:20:32 -0000      1.3874
  +++ openpkg-web/news.txt      28 Mar 2003 16:39:00 -0000      1.3875
  @@ -132,11 +132,8 @@
   20-Mar-2003: Upgraded package: P<coreutils-4.5.11-20030320>
   20-Mar-2003: Upgraded package: P<cvsps-2.0b6-20030320>
   20-Mar-2003: Upgraded package: P<fsl-1.0.8-20030320>
  -<<<<<<< news.txt
   20-Mar-2003: Upgraded package: P<mutt-1.4.1i-20030320>
  -=======
   20-Mar-2003: Upgraded package: P<openpkg-tool-20030320-20030320>
  ->>>>>>> 1.3741
   20-Mar-2003: Upgraded package: P<emacs-21.3-20030319>
   20-Mar-2003: Upgraded package: P<lyx-1.3.1-20030320>
   20-Mar-2003: Upgraded package: P<perl-tk-20030320-20030320>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to