RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Pinto Elia
  Root:   /v/rpm/cvs                       Email:  devzero2...@rpm5.org
  Module: rpm                              Date:   02-May-2011 18:04:58
  Branch: HEAD                             Handle: 2011050216045700

  Modified files:
    rpm                     CHANGES devtool.conf

  Log:
    update devtool.conf with the new autofu switch
    for splitting vendor config in autofu as appropiate, for my
    knownledge. Add also some apparently missing
    --with-vendor switch.

  Summary:
    Revision    Changes     Path
    1.3621      +3  -0      rpm/CHANGES
    2.374       +16 -0      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3620 -r1.3621 CHANGES
  --- rpm/CHANGES       20 Apr 2011 15:27:34 -0000      1.3620
  +++ rpm/CHANGES       2 May 2011 16:04:57 -0000       1.3621
  @@ -1,4 +1,7 @@
   5.4.0 -> 5.4.1:
  +    - devzero2000: update devtool.conf with the new autofu switch
  +      for splitting vendor config in autofu as appropiate, for my
  +      knownledge. Add also some apparently missing --with-vendor switch.
       - devzero2000: permit in configure phase to 
         --enable-rpmvercmp-digits-beat-alpha for reverting to the old 
rpmvercmp 
         behavior where digits beat alpha as used by Mandriva, Fedora, Suse 
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.373 -r2.374 devtool.conf
  --- rpm/devtool.conf  31 Mar 2011 22:55:04 -0000      2.373
  +++ rpm/devtool.conf  2 May 2011 16:04:57 -0000       2.374
  @@ -392,6 +392,8 @@
           --enable-build-versionscript \
           --enable-build-warnings \
           --enable-build-debug \
  +        --enable-rpmvercmp-digits-beat-alpha \
  +        --with-vendor=fedora \
           --enable-maintainer-mode
   
   # CentOS 5.x/x86_64
  @@ -463,6 +465,8 @@
           --enable-build-versionscript \
           --enable-build-warnings \
           --enable-build-debug \
  +        --enable-rpmvercmp-digits-beat-alpha \
  +        --with-vendor=fedora \
           --enable-maintainer-mode
   
   # RHEL6x
  @@ -533,6 +537,8 @@
           --enable-build-versionscript \
           --enable-build-warnings \
           --enable-build-debug \
  +        --with-vendor=fedora \
  +        --enable-rpmvercmp-digits-beat-alpha \
           --enable-maintainer-mode
   
   # Caixa Magica 14
  @@ -739,6 +745,9 @@
           --enable-build-pic \
           --enable-build-versionscript \
           --enable-build-warnings \
  +        --with-vendor=mandriva \
  +        --enable-rpmvercmp-digits-beat-alpha \
  +        --disable-dirname-and-symlink-deps \
           --enable-build-debug \
           --enable-maintainer-mode
   
  @@ -816,6 +825,8 @@
           --enable-build-warnings \
           --enable-build-debug \
           --enable-maintainer-mode \
  +        --enable-rpmvercmp-digits-beat-alpha \
  +        --disable-dirname-and-symlink-deps \
           
--with-extra-path-macros=/usr/lib/rpm/platform/%{_target}/macros:/usr/lib/rpm/mandriva/platform/%{_target}/macros:/etc/rpm/macros.d/*.macros:/usr/lib/rpm/macros.d/mandriva
        echo '#define PREMACROFILES "/etc/rpm/premacros.d/*.macros"' >> config.h
   
  @@ -1019,6 +1030,8 @@
           --enable-build-versionscript \
           --enable-build-warnings \
           --enable-build-debug \
  +        --with-vendor=fedora \
  +        --enable-rpmvercmp-digits-beat-alpha \
           --enable-maintainer-mode
   
   # CentOS 5.x
  @@ -1086,6 +1099,7 @@
           --enable-build-versionscript \
           --enable-build-warnings \
           --enable-build-debug \
  +        --enable-rpmvercmp-digits-beat-alpha \
           --enable-maintainer-mode
   
   # OpenIndiana on x86
  @@ -1225,6 +1239,7 @@
           --enable-build-versionscript \
           --enable-build-warnings \
           --enable-build-debug \
  +        --enable-rpmvercmp-digits-beat-alpha \
           --enable-maintainer-mode
   
   %sles11
  @@ -1294,6 +1309,7 @@
           --enable-build-versionscript \
           --enable-build-warnings \
           --enable-build-debug \
  +        --enable-rpmvercmp-digits-beat-alpha \
           --enable-maintainer-mode
   
   # CC=ccache env UMASK=022 distcc cc
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to