--- rpms/initscripts/sme7/initscripts.spec	2007/06/12 16:26:34	1.1
+++ rpms/initscripts/sme7/initscripts.spec	2007/12/01 02:33:46	1.2
@@ -1,13 +1,14 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 7.93.29.EL
+Version: 7.93.31.EL
 License: GPL
 Group: System Environment/Base
-Release: 1%{?dist}
+Release: 2.centos4%{?dist}
 Source: initscripts-%{version}.tar.bz2
 URL: http://fedora.redhat.com/projects/additional-projects/initscripts/
 Patch0: initscripts-s390.patch
-Patch1: centos4-initscripts.patch
+Patch1: initscripts-kmodule.patch
+Patch100: centos4-initscripts.patch
 Patch1000: smeserver-initscripts-service.patch
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
@@ -41,13 +42,11 @@ deactivate most network interfaces.
 %ifarch s390 s390x
 %patch0 -p1 -b .s390init
 %endif
-
-# CentOS-4 patch
-%patch1 -p1
-
-# SME Server patch
+%patch1 -p1 -b .kmodule
+%patch100 -p1
 %patch1000 -p1
 
+
 %build
 make
 
@@ -71,8 +70,7 @@ rm -f \
 %else
 rm -f \
  $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \
- $RPM_BUILD_ROOT/etc/sysconfig/init.s390 \
- $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.orig
+ $RPM_BUILD_ROOT/etc/sysconfig/init.s390
 %endif
 
 %pre
@@ -217,7 +215,7 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
-* Thu May 17 2007 Gordon Rowell <gordonr@gormand.com.au> 7.93.29.EL-1.centos4.sme
+* Fri Nov 30 2007 Shad L. Lords <slords@mail.com> 7.93.31.EL-2.centos4.sme
 - Reapply SME Server patches [SME: 2043]
 - Exit with zero exit status for services not listed in configuration
   database to avoid failures in post scriptlets [SME: 1653]
@@ -226,10 +224,20 @@ rm -rf $RPM_BUILD_ROOT
   that the supervised service is run, if one exists, and protects
   against running "service httpd restart" [SME: 61, 1495]
 
-* Wed May  2 2007 Johnny Hughes <johnny@centos.org> -  7.93.29.EL-1.centos4
+* Sat Nov 17 2007 Johnny Hughes <johnny@centos.org> -  7.93.31.EL-2.centos4
 - Reapplied the CentOS 4 patches
 - added remove rc.sysinit.orig to spec file
 
+* Mon Sep 10 2007 Bill Nottingham <notting@redhat.com> - 7.93.31.EL-2
+- kmodule: use a better algorithm for finding modules (#270741)
+
+* Thu Aug 02 2007 Harald Hoyer <harald@redhat.com> - 7.93.31.EL-1
+- set the hwclock before udev starts (#230997)
+
+* Fri Jun 22 2007 Bill Nottingham <notting@redhat.com> - 7.93.30.EL-1
+- init.d/network, network-functions: don't fiddle with hotplug settings (#185569, #209307)
+- init.d/network: add support for VLAN_PLUS_VID_NO_PAD vlans (#222975)
+
 * Mon Feb 12 2007 Miloslav Trmac <mitr@redhat.com> - 7.93.29.EL-1
 - Revert a backport of UTF-8 support for console keymaps
   Related: #150769
@@ -276,10 +284,6 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Jan 12 2006 Bill Nottingham <notting@redhat.com>
 - ignore sysfs but not /sys<otherstuff> (#177612, <bnocera@redhat.com>)
 
-* Sat Dec 31 2005 Pasi Pirhonen <upi@iki.fi> 7.93.23.EL-1.centos4
-- Removed trademark info, added color CentOS prompt
-- Removed < 256mb RAM 10 sec pause
-
 * Thu Dec 15 2005 Bill Nottingham <notting@redhat.com> 7.93.24.EL-1
 - correct fix for #172804