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

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   10-Aug-2004 17:19:27
  Branch: OPENPKG_2_0_SOLID                Handle: 2004081016192600

  Modified files:           (Branch: OPENPKG_2_0_SOLID)
    openpkg-src/cvstrac     cvstrac.patch cvstrac.spec

  Log:
    correct or at least use consistent syntax of default configured RCS
    commands rcsdiff(1) and co(1)

  Summary:
    Revision    Changes     Path
    1.2.2.2     +4  -4      openpkg-src/cvstrac/cvstrac.patch
    1.32.2.3    +1  -1      openpkg-src/cvstrac/cvstrac.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/cvstrac/cvstrac.patch
  ============================================================================
  $ cvs diff -u -r1.2.2.1 -r1.2.2.2 cvstrac.patch
  --- openpkg-src/cvstrac/cvstrac.patch 6 Aug 2004 13:54:18 -0000       1.2.2.1
  +++ openpkg-src/cvstrac/cvstrac.patch 10 Aug 2004 15:19:26 -0000      1.2.2.2
  @@ -192,7 +192,7 @@
      @
      @ <blockquote><pre>
   -  @ rcsdiff -q -r%%V1 -r%%V2 -u '%%F'
  -+  @ rcsdiff -q -r '%%V1' -r '%%V2' -u '%%F'
  ++  @ rcsdiff -q -r'%%V1' -r'%%V2' -u '%%F'
      @ </pre></blockquote>
      @ </form>
      @ </p>
  @@ -201,7 +201,7 @@
      @
      @ <blockquote><pre>
   -  @ co -q -p%%V '%%F' | diff -c /dev/null -
  -+  @ co -q -p '%%V' '%%F' | diff -c /dev/null -
  ++  @ co -q -p'%%V' '%%F' | diff -c /dev/null -
      @ </pre></blockquote>
      @ </form>
      @ </p>
  @@ -258,13 +258,13 @@
      azSubst[1] = file;
      if( oldVersion[0]==0 ){
   -    zTemplate = db_config("filelist","co -q -p%V '%F' | diff -c /dev/null -");
  -+    zTemplate = db_config("filelist","co -q -p '%V' '%F' | diff -c /dev/null -");
  ++    zTemplate = db_config("filelist","co -q -p'%V' '%F' | diff -c /dev/null -");
        azSubst[2] = "V";
        azSubst[3] = newVersion;
        azSubst[4] = 0;
      }else{
   -    zTemplate = db_config("filediff","rcsdiff -q -r%V1 -r%V2 -u '%F'");
  -+    zTemplate = db_config("filediff","rcsdiff -q -r '%V1' -r '%V2' -u '%F'");
  ++    zTemplate = db_config("filediff","rcsdiff -q -r'%V1' -r'%V2' -u '%F'");
        azSubst[2] = "V1";
        azSubst[3] = oldVersion;
        azSubst[4] = "V2";
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cvstrac/cvstrac.spec
  ============================================================================
  $ cvs diff -u -r1.32.2.2 -r1.32.2.3 cvstrac.spec
  --- openpkg-src/cvstrac/cvstrac.spec  6 Aug 2004 13:54:18 -0000       1.32.2.2
  +++ openpkg-src/cvstrac/cvstrac.spec  10 Aug 2004 15:19:26 -0000      1.32.2.3
  @@ -34,7 +34,7 @@
   Group:        Database
   License:      GPL
   Version:      1.1.2
  -Release:      2.0.1
  +Release:      2.0.2
   
   #   list of sources
   Source0:      http://www.hwaci.com/sw/cvstrac/cvstrac-%{version}.tar.gz
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to