--- rpms/initscripts/sme7/initscripts.spec 2008/09/12 03:13:31 1.5 +++ rpms/initscripts/sme7/initscripts.spec 2009/08/24 14:53:53 1.6 @@ -1,16 +1,13 @@ -# $Id: initscripts.spec,v 1.3 2008/04/09 13:51:49 slords Exp $ - Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 7.93.33 +Version: 7.93.34 License: GPL Group: System Environment/Base -Release: 1.centos4%{?dist} +Release: 1.centos4 Source: initscripts-%{version}.tar.bz2 URL: http://fedora.redhat.com/projects/additional-projects/initscripts/ Patch0: initscripts-s390.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 @@ -24,12 +21,12 @@ Requires: ethtool >= 1.8-2, kernel >= 2. Conflicts: mkinitrd < 4.0 Conflicts: timeconfig < 3.0, ppp < 2.3.9, wvdial < 1.40-3 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 -Conflicts: udev < 0:032 +Conflicts: udev < 0:039-10.24 Conflicts: tcsh < 6.13-5, diskdumputils < 1.1.0 Obsoletes: rhsound sapinit Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk, fileutils, sh-utils BuildPrereq: glib2-devel popt gettext pkgconfig -BuildPrereq: kudzu-devel >= 1.1.80 +BuildPrereq: kudzu-devel >= 1.1.95.24-1 %description The initscripts package contains the basic system scripts used to boot @@ -47,8 +44,6 @@ deactivate most network interfaces. #added by CentOS %patch100 -p1 -%patch1000 -p1 - %build make @@ -217,14 +212,16 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog -* Thu Sep 11 2008 Shad L. Lords 7.93.33-1.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] +* Thu Jul 2 2009 Tru Huynh - 7.93.34-1.centos4 +- Reapplied the CentOS 4 patches + +* Fri Jan 23 2009 Harald Hoyer - 7.93.34-1 +- add LINKDELAY to check_link_down() (bug #458323) (harald) +- s/J/Y - Dutch translation mistake for integrity check (bug #237118) (harald) +- link against newer kudzu-devel (bug #478881, #468680) (harald) +- Backport fix for releasing bonding slaves properly and not looping. (#448837, #220525) (notting) +- add udevsettle to rc.sysinit (bug #198704) +Resolves: rhbz#478881, rhbz#458323, rhbz#448837, rhbz#237118 * Wed Jun 25 2008 Bill Nottingham - 7.93.33-1 - the MAC addr patch does not work - pull it