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: 30-Mar-2011 18:32:12
Branch: rpm-5_3 Handle: 2011033016321101
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/macros macros.in
Log:
change the order for the _initddir macro assignment
Summary:
Revision Changes Path
1.3296.2.188+1 -0 rpm/CHANGES
1.28.2.15 +3 -4 rpm/macros/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.187 -r1.3296.2.188 CHANGES
--- rpm/CHANGES 30 Mar 2011 14:35:31 -0000 1.3296.2.187
+++ rpm/CHANGES 30 Mar 2011 16:32:11 -0000 1.3296.2.188
@@ -1,4 +1,5 @@
5.3.9 -> 5.3.10
+ - 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.28.2.14 -r1.28.2.15 macros.in
--- rpm/macros/macros.in 30 Mar 2011 11:19:05 -0000 1.28.2.14
+++ rpm/macros/macros.in 30 Mar 2011 16:32:12 -0000 1.28.2.15
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.28.2.14 2011/03/30 11:19:05 devzero2000 Exp $
+# $Id: macros.in,v 1.28.2.15 2011/03/30 16:32:12 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
@@ -864,10 +864,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}
#---------------------------------------------------------------------
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
