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:   04-Apr-2006 14:35:13
  Branch: HEAD                             Handle: 2006040413351200

  Modified files:
    openpkg-src/mtools      mtools.patch mtools.spec

  Log:
    apply the latest vendor patch set

  Summary:
    Revision    Changes     Path
    1.2         +0  -12     openpkg-src/mtools/mtools.patch
    1.36        +17 -6      openpkg-src/mtools/mtools.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mtools/mtools.patch
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 mtools.patch
  --- openpkg-src/mtools/mtools.patch   27 Mar 2006 17:55:49 -0000      1.1
  +++ openpkg-src/mtools/mtools.patch   4 Apr 2006 12:35:12 -0000       1.2
  @@ -16,15 +16,3 @@
    
        homedir = get_homedir();
        if ( homedir ){
  -Index: mdel.c
  ---- mdel.c.orig      2005-02-13 15:49:22 +0100
  -+++ mdel.c   2006-03-27 19:43:36 +0200
  -@@ -125,7 +125,7 @@
  -     fprintf(stderr, 
  -             "Mtools version %s, dated %s\n", mversion, mdate);
  -     fprintf(stderr, 
  --            "Usage: %s [-v] msdosfile [msdosfiles...]", progname);
  -+            "Usage: %s [-v] msdosfile [msdosfiles...]\n", progname);
  -     exit(1);
  - }
  - 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mtools/mtools.spec
  ============================================================================
  $ cvs diff -u -r1.35 -r1.36 mtools.spec
  --- openpkg-src/mtools/mtools.spec    27 Mar 2006 17:55:49 -0000      1.35
  +++ openpkg-src/mtools/mtools.spec    4 Apr 2006 12:35:12 -0000       1.36
  @@ -22,6 +22,10 @@
   ##  SUCH DAMAGE.
   ##
   
  +#   package version
  +%define       V_base  3.9.10
  +%define       V_patch 20060228b
  +
   #   package information
   Name:         mtools
   Summary:      Access MS-DOS disks from Unix without mounting
  @@ -32,12 +36,13 @@
   Class:        PLUS
   Group:        System
   License:      GPL
  -Version:      3.9.10
  -Release:      20060327
  +Version:      %{V_base}
  +Release:      20060404
   
   #   list of sources
  -Source0:      http://mtools.linux.lu/mtools-%{version}.tar.gz
  -Patch0:       mtools.patch
  +Source0:      http://mtools.linux.lu/mtools-%{V_base}.tar.gz
  +Patch0:       http://mtools.linux.lu/mtools-%{V_base}-%{V_patch}.diff.gz
  +Patch1:       mtools.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -55,14 +60,20 @@
   
   %track
       prog mtools = {
  -        version   = %{version}
  +        version   = %{V_base}
           url       = http://mtools.linux.lu/download.html
           regex     = mtools-(__VER__)\.tar\.gz
       }
  +    prog mtools:patch = {
  +        version   = %{V_patch}
  +        url       = http://mtools.linux.lu/download.html
  +        regex     = mtools-%{V_base}-(__VER__)\.diff\.gz
  +    }
   
   %prep
       %setup -q
  -    %patch -p0
  +    %patch -p1 -P 0
  +    %patch -p0 -P 1
   
   %build
       CC="%{l_cc}" \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to