From 938773a4df4410918f8a78a15545806172767140 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 11 Jul 2000 17:00:00 +0000
Subject: bump release to 5.31, implement rc.d disappearance with RPM Magic

---
 ChangeLog        | 31 +++++++++++++++++++++++++++++++
 initscripts.spec | 22 ++++++++++++++--------
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4ecb9f1..965c33cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2000-07-11  Bill Nottingham  <notting@redhat.com>
+
+	* sysconfig.txt:
+	fix some of the harddisks documentation
+
+2000-07-10  Trond Eivind Glomsrod  <teg@redhat.com>
+
+	* rc.d/rc.sysinit:
+	Don't try to initialize disabled (IRQwise) USB controller.
+
+2000-07-10  Bill Nottingham  <notting@redhat.com>
+
+	* sysconfig.txt:
+	add some info about /etc/sysconfig/harddisks
+
+2000-07-09  Bill Nottingham  <notting@redhat.com>
+
+	* initscripts.spec:
+	don't include rc.d/* in filelist
+
+2000-07-07  Bill Nottingham  <notting@redhat.com>
+
+	* initscripts.spec:
+	*** empty log message ***
+
+	* ChangeLog, initscripts.spec:
+	release 5.29
+
+	* initscripts.spec:
+	check to see if rc.d exists
+
 2000-07-07  Bill Nottingham  <notting@redhat.com>
 
 	* initscripts.spec:
diff --git a/initscripts.spec b/initscripts.spec
index e039c989..18dfb7d6 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 5.30
+Version: 5.31
 Copyright: GPL
 Group: System Environment/Base
 Release: 1
@@ -13,6 +13,9 @@ Requires: modutils >= 2.3.11-5
 %ifarch alpha
 Requires: util-linux >= 2.9w-26
 %endif
+PreTransaction: mv /etc/rc.d/* /etc
+PreTransaction: rmdir /etc/rc.d
+PreTransaction: symlink . /etc/rc.d
 Conflicts: kernel <= 2.2, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
 Conflicts: initscripts < 1.22.1-5
 Obsoletes: rhsound sapinit
@@ -66,13 +69,13 @@ touch $RPM_BUILD_ROOT/var/log/wtmp
 
 %pre
 /usr/sbin/groupadd -g 22 -r -f utmp
-if [ -e /etc/rc.d -a ! -L /etc/rc.d -a -d /etc/init.d ]; then
-   echo "can't move /etc/rc.d/init.d -> /etc/init.d - bailing"
-   exit 1
-fi
-if [ -d /etc/rc.d -a ! -L /etc/rc.d ]; then
-   mv -f /etc/rc.d/* /etc && rm -rf /etc/rc.d && ln -snf . /etc/rc.d
-fi
+#if [ -e /etc/rc.d -a ! -L /etc/rc.d -a -d /etc/init.d ]; then
+#   echo "can't move /etc/rc.d/init.d -> /etc/init.d - bailing"
+#   exit 1
+#fi
+#if [ -d /etc/rc.d -a ! -L /etc/rc.d ]; then
+#   mv -f /etc/rc.d/* /etc && rm -rf /etc/rc.d && ln -snf . /etc/rc.d
+#fi
 
 %post
 touch /var/log/wtmp
@@ -223,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Tue Jul 11 2000 Bill Nottingham <notting@redhat.com>
+- implement the %pre with RPM Magic(tm)
+
 * Sat Jul  8 2000 Bill Nottingham <notting@redhat.com>
 - fix it to not follow /etc/rc.d
 
-- 
cgit v1.2.1