- kill invalid %{_sysconfdir} usage for _initrddir

Changed files:
    rpm-macros-amd64 -> 1.2
    rpm-macros-athlon -> 1.2
    rpm-macros-i386 -> 1.2
    rpm-macros-i486 -> 1.2
    rpm-macros-i586 -> 1.2
    rpm-macros-i686 -> 1.2
    rpm-macros-ia32e -> 1.2
    rpm-macros-noarch -> 1.2
    rpm-macros-pentium3 -> 1.2
    rpm-macros-pentium4 -> 1.2
    rpm-macros-ppc -> 1.2
    rpm-macros-x86_64 -> 1.2

diff --git a/rpm-macros-amd64 b/rpm-macros-amd64
index 6b1313d486aa8c1f9a65ff6772967c97cd7c4bf8..3e2f6e7ca117b507c41eccd456bf6f63aa5c1026 100644 (file)
--- a/rpm-macros-amd64
+++ b/rpm-macros-amd64
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs

diff --git a/rpm-macros-athlon b/rpm-macros-athlon
index f65b8cfe9ee621308559cfc78912bf7dbf0ae08b..51c54c79d39bef9b33542c1704d3737d82f17c48 100644 (file)
--- a/rpm-macros-athlon
+++ b/rpm-macros-athlon
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs

diff --git a/rpm-macros-i386 b/rpm-macros-i386
index 006045ab0d838c07280566cd911c83c8e4c6e764..756317f28d2727d7e60e1047f1a176b3017d6ff6 100644 (file)
--- a/rpm-macros-i386
+++ b/rpm-macros-i386
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs

diff --git a/rpm-macros-i486 b/rpm-macros-i486
index b13f9f5da86c771f4ac55809bf6460b9585aff6d..b29cc5fbdbe2371c8ecd055012994cc8782f7dcb 100644 (file)
--- a/rpm-macros-i486
+++ b/rpm-macros-i486
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs

diff --git a/rpm-macros-i586 b/rpm-macros-i586
index cb976ee8c9bebf9855cdb3b7a7692743a07fb9a8..5c4545fd8f8af570ffd4f80f789cb02679c93e9d 100644 (file)
--- a/rpm-macros-i586
+++ b/rpm-macros-i586
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs

diff --git a/rpm-macros-i686 b/rpm-macros-i686
index 92a8a98e818f669d85c03065987ea2e27ec2f831..ba6e326fdab59c27ab9784ff6f60cd714203236e 100644 (file)
--- a/rpm-macros-i686
+++ b/rpm-macros-i686
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs

diff --git a/rpm-macros-ia32e b/rpm-macros-ia32e
index 61f20f4103f4e9d2879b0a294b19640b51bf1eed..791e9a0e1202da42eb6f30ee6a6aaed3c653e6bd 100644 (file)
--- a/rpm-macros-ia32e
+++ b/rpm-macros-ia32e
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs

diff --git a/rpm-macros-noarch b/rpm-macros-noarch
index 0efe99a84f320f7d29fd896cdd8d07995786af32..fec201845d1ca41ba72e104bc3696e10db1b36a3 100644 (file)
--- a/rpm-macros-noarch
+++ b/rpm-macros-noarch
@@ -27,7 +27,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #      Multilibs
 %_multilibno           2

diff --git a/rpm-macros-pentium3 b/rpm-macros-pentium3
index 01a9fbf0445fe11ad527f08a520b50c96c86d3b2..87c181b36215c131b3aeb311fccac5b7ad33a8ec 100644 (file)
--- a/rpm-macros-pentium3
+++ b/rpm-macros-pentium3
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs

diff --git a/rpm-macros-pentium4 b/rpm-macros-pentium4
index 869e5ae0b1fe989a40b1f0b1d4c7f2583a0987a8..ca1fbfa7701b71526cfaed38fce3fa080cfc8c96 100644 (file)
--- a/rpm-macros-pentium4
+++ b/rpm-macros-pentium4
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs

diff --git a/rpm-macros-ppc b/rpm-macros-ppc
index a9a3c500dbf34d433673bd2ab74acfe40a5dee9c..7a45c57bdac5a6a98fe8a94d61322fb04f437fd9 100644 (file)
--- a/rpm-macros-ppc
+++ b/rpm-macros-ppc
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs

diff --git a/rpm-macros-x86_64 b/rpm-macros-x86_64
index 10bfc31481c3706ae61888f6e80c6458f36735e0..579ccacbf1e0153074955ccdd510aaa0af6e4fef 100644 (file)
--- a/rpm-macros-x86_64
+++ b/rpm-macros-x86_64
@@ -28,7 +28,7 @@
 %_oldincludedir                /usr/include
 %_infodir              /usr/share/info
 %_mandir               /usr/share/man
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initrddir            /etc/rc.d/init.d
 
 #---------------------------------------------------------------------
 #      Multilibs