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:   27-Aug-2007 12:28:47
  Branch: HEAD                             Handle: 2007082711284700

  Modified files:
    openpkg-src/java-gcj    java-gcj.spec

  Log:
    remove obsolete conflicts marker

  Summary:
    Revision    Changes     Path
    1.2         +0  -1      openpkg-src/java-gcj/java-gcj.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/java-gcj/java-gcj.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 java-gcj.spec
  --- openpkg-src/java-gcj/java-gcj.spec        27 Aug 2007 08:29:51 -0000      
1.1
  +++ openpkg-src/java-gcj/java-gcj.spec        27 Aug 2007 10:28:47 -0000      
1.2
  @@ -48,7 +48,6 @@
   PreReq:       gcc >= 4.2, gcc::with_java = yes, fastjar, gjdoc
   AutoReq:      no
   AutoReqProv:  no
  -Conflicts:    j2se
   
   %description
       This is a glue package to provide a minimum Sun Java JDK/JRE like
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to