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

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   23-Jul-2003 14:57:48
  Branch: HEAD                             Handle: 2003072313574602

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

  Log:
    conflict for POP providers

  Summary:
    Revision    Changes     Path
    1.60        +2  -1      openpkg-src/qpopper/qpopper.spec
    1.5748      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/qpopper/qpopper.spec
  ============================================================================
  $ cvs diff -u -r1.59 -r1.60 qpopper.spec
  --- openpkg-src/qpopper/qpopper.spec  22 Jul 2003 08:11:06 -0000      1.59
  +++ openpkg-src/qpopper/qpopper.spec  23 Jul 2003 12:57:48 -0000      1.60
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      4.0.5
  -Release:      20030722
  +Release:      20030723
   
   #   package options
   %option       with_fsl  yes
  @@ -61,6 +61,7 @@
   AutoReq:      no
   AutoReqProv:  no
   Provides:     POP
  +Conflicts:    teapop
   
   %description
       Qualcom Popper is a full-featured POP3 daemon.
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5747 -r1.5748 news.txt
  --- openpkg-web/news.txt      23 Jul 2003 12:31:40 -0000      1.5747
  +++ openpkg-web/news.txt      23 Jul 2003 12:57:46 -0000      1.5748
  @@ -1,3 +1,4 @@
  +23-Jul-2003: Upgraded package: P<qpopper-4.0.5-20030723>
   23-Jul-2003: Upgraded package: P<spamassassin-2.55-20030723>
   23-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030723>
   23-Jul-2003: Upgraded package: P<lmtp2nntp-1.2.0-20030723>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to