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:56:17
  Branch: HEAD                             Handle: 2008041411561600

  Modified files:
    openpkg-src/openvpn21   openvpn21.spec

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

  Summary:
    Revision    Changes     Path
    1.6         +1  -2      openpkg-src/openvpn21/openvpn21.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openvpn21/openvpn21.spec
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 openvpn21.spec
  --- openpkg-src/openvpn21/openvpn21.spec      23 Mar 2008 08:56:28 -0000      
1.5
  +++ openpkg-src/openvpn21/openvpn21.spec      14 Apr 2008 10:56:16 -0000      
1.6
  @@ -36,7 +36,7 @@
   Group:        Network
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20080323
  +Release:      20080414
   
   #   package options
   %option       with_fsl  yes
  @@ -62,7 +62,6 @@
   AutoReq:      no
   AutoReqProv:  no
   Provides:     openvpn = %{version}-%{release}
  -Conflicts:    openvpn
   
   %description
       OpenVPN is a robust and highly configurable VPN (Virtual Private
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to