--- rpms/initscripts/sme7/initscripts.spec	2008/04/09 13:51:49	1.3
+++ rpms/initscripts/sme7/initscripts.spec	2008/09/12 03:08:02	1.4
@@ -1,17 +1,13 @@
-# $Id$
-
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 7.93.31.EL
+Version: 7.93.33
 License: GPL
 Group: System Environment/Base
-Release: 2.centos4%{?dist}
+Release: 1.centos4
 Source: initscripts-%{version}.tar.bz2
 URL: http://fedora.redhat.com/projects/additional-projects/initscripts/
 Patch0: initscripts-s390.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
 Requires: /sbin/sysctl, sysklogd >= 1.3.31
@@ -44,10 +40,9 @@ deactivate most network interfaces.
 %ifarch s390 s390x
 %patch0 -p1 -b .s390init
 %endif
-%patch1 -p1 -b .kmodule
-%patch100 -p1
-%patch1000 -p1
 
+#added by CentOS
+%patch100 -p1
 
 %build
 make
@@ -217,18 +212,16 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
-* 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]
-- Merge in SME Server /sbin/e-smith/service wrapper so that only
-  initscripts which exist in run-level 7 can be run. This ensures
-  that the supervised service is run, if one exists, and protects
-  against running "service httpd restart" [SME: 61, 1495]
-
-* 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
+* Wed Jun 25 2008 Bill Nottingham <notting@redhat.com> - 7.93.33-1
+- the MAC addr patch does not work - pull it
+- Reverts: rhbz#251415
+
+* Mon Apr 14 2008 Harald Hoyer <harald@redhat.com> 7.93.32-1
+- don't do something odd if we find a mac address that matches the user-set MACADDR (#251415) (notting)
+- backport getkey race fixes from RHEL 5 (#313611) (mpoole)
+- Fix genhostid for x86_64 (#311611) (notting)
+- netfs: sort nfs mounts for unmounting (#251657) (notting)
+- Resolves: rhbz#251657, rhbz#311611, rhbz#251415, rhbz#313611
 
 * Mon Sep 10 2007 Bill Nottingham <notting@redhat.com> - 7.93.31.EL-2
 - kmodule: use a better algorithm for finding modules (#270741)