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

  Server: rpm5.org                         Name:   Pinto Elia
  Root:   /v/rpm/cvs                       Email:  [email protected]
  Module: rpm                              Date:   30-Mar-2011 12:53:26
  Branch: HEAD                             Handle: 2011033010532600

  Modified files:
    rpm                     CHANGES
    rpm/macros              macros.in

  Log:
    devzero2000: add %_initddir macro for Mandriva
    (ref http://lists.mandriva.com/maintainers/2011-03/msg00252.php)

  Summary:
    Revision    Changes     Path
    1.3584      +2  -0      rpm/CHANGES
    1.46        +5  -3      rpm/macros/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3583 -r1.3584 CHANGES
  --- rpm/CHANGES       29 Mar 2011 08:02:27 -0000      1.3583
  +++ rpm/CHANGES       30 Mar 2011 10:53:26 -0000      1.3584
  @@ -1,4 +1,6 @@
   5.4.0 -> 5.4.1:
  +    - devzero2000: add %_initddir macro for Mandriva 
  +      (ref http://lists.mandriva.com/maintainers/2011-03/msg00252.php)
       - jbj: fix: reduce false positives checking for 
         duplicate keys (mdvbz#62822).
       - jbj: uuid: permit --qf '%{RPMTAG:uuid}' UUIDv1/UUIDv5 output display.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  ============================================================================
  $ cvs diff -u -r1.45 -r1.46 macros.in
  --- rpm/macros/macros.in      29 Mar 2011 08:02:27 -0000      1.45
  +++ rpm/macros/macros.in      30 Mar 2011 10:53:26 -0000      1.46
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.45 2011/03/29 08:02:27 devzero2000 Exp $
  +# $Id: macros.in,v 1.46 2011/03/30 10:53:26 devzero2000 Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -866,8 +866,10 @@
   %_mandir             %{_datarootdir}/man
   %_localedir          %{_datarootdir}/locale
   %_lispdir            %{_datarootdir}/emacs/site-lisp
  -
  -%_initrddir          %{_sysconfdir}/rc.d/init.d
  +%_initddir              %{_sysconfdir}/rc.d/init.d
  +# This is a deprecated misspelling, present for backwards compatibility.
  +# %_initrddir             %{_initddir}
  +%_initrddir          %{_initddir}
   
   #---------------------------------------------------------------------
   #   Multilibs
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to