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 18:27:07
  Branch: HEAD                             Handle: 2011033016270601

  Modified files:
    rpm                     CHANGES
    rpm/macros              macros.in

  Log:
    change the order for the _initddir macro assignment

  Summary:
    Revision    Changes     Path
    1.3587      +1  -0      rpm/CHANGES
    1.48        +3  -3      rpm/macros/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3586 -r1.3587 CHANGES
  --- rpm/CHANGES       30 Mar 2011 14:33:34 -0000      1.3586
  +++ rpm/CHANGES       30 Mar 2011 16:27:06 -0000      1.3587
  @@ -1,4 +1,5 @@
   5.4.0 -> 5.4.1:
  +    - devzero2000: change the order for the _initddir macro assignment
       - proyvind: mandriva: add systemd macros (mdvbz#62741, from Andrey 
Borzenkov).
       - proyvind: dbconvert: fix conversion to older hash database format
        resulting in "missing" package from rpmdb.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  ============================================================================
  $ cvs diff -u -r1.47 -r1.48 macros.in
  --- rpm/macros/macros.in      30 Mar 2011 11:10:59 -0000      1.47
  +++ rpm/macros/macros.in      30 Mar 2011 16:27:07 -0000      1.48
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.47 2011/03/30 11:10:59 devzero2000 Exp $
  +# $Id: macros.in,v 1.48 2011/03/30 16:27:07 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,9 +866,9 @@
   %_mandir             %{_datarootdir}/man
   %_localedir          %{_datarootdir}/locale
   %_lispdir            %{_datarootdir}/emacs/site-lisp
  -%_initddir              %{_sysconfdir}/rc.d/init.d
   # This is a deprecated misspelling, present for backwards compatibility.
  -%_initrddir          %{_initddir}
  +%_initrddir             %{_sysconfdir}/rc.d/init.d
  +%_initddir           %{_initrdir}
   
   #---------------------------------------------------------------------
   #   Multilibs
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to