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: 31-Mar-2011 09:40:20 Branch: HEAD Handle: 2011033107401901 Modified files: rpm CHANGES rpm/macros macros.in Log: I misread the private review, repost as the original patch Summary: Revision Changes Path 1.3588 +1 -0 rpm/CHANGES 1.50 +3 -3 rpm/macros/macros.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3587 -r1.3588 CHANGES --- rpm/CHANGES 30 Mar 2011 16:27:06 -0000 1.3587 +++ rpm/CHANGES 31 Mar 2011 07:40:19 -0000 1.3588 @@ -1,4 +1,5 @@ 5.4.0 -> 5.4.1: + - devzero2000: misread the review, repost as the original patch - 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 @@ . patch -p0 <<'@@ .' Index: rpm/macros/macros.in ============================================================================ $ cvs diff -u -r1.49 -r1.50 macros.in --- rpm/macros/macros.in 31 Mar 2011 07:20:45 -0000 1.49 +++ rpm/macros/macros.in 31 Mar 2011 07:40:20 -0000 1.50 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.49 2011/03/31 07:20:45 devzero2000 Exp $ +# $Id: macros.in,v 1.50 2011/03/31 07:40:20 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 %{_sysconfdir}/rc.d/init.d -%_initddir %{_initrddir} +%_initrddir %{_initddir} #--------------------------------------------------------------------- # Multilibs @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
