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:   14-Apr-2008 12:58:07
  Branch: HEAD                             Handle: 2008041411580700

  Modified files:
    openpkg-src/subversion15
                            subversion15.spec

  Log:
    remove explicit Conflict as RPM 5 dislikes the combination of Provides
    and Conflicts (for the same NEVRA)

  Summary:
    Revision    Changes     Path
    1.2         +1  -2      openpkg-src/subversion15/subversion15.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/subversion15/subversion15.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 subversion15.spec
  --- openpkg-src/subversion15/subversion15.spec        3 Apr 2008 08:18:05 
-0000       1.1
  +++ openpkg-src/subversion15/subversion15.spec        14 Apr 2008 10:58:07 
-0000      1.2
  @@ -40,7 +40,7 @@
   Group:        SCM
   License:      Apache/BSD
   Version:      %{V_opkg}
  -Release:      20080403
  +Release:      20080414
   
   #   package options
   %option       with_cvs2svn  no
  @@ -99,7 +99,6 @@
   AutoReq:      no
   AutoReqProv:  no
   Provides:     subversion = %{version}-%{release}
  -Conflicts:    subversion
   
   %description
       Subversion is a modern Version Control System (VCS) providing most
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to