diff --git a/.cvsignore b/.cvsignore index 7618acb..c28583a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.05.tar.bz2 +initscripts-9.06.tar.bz2 diff --git a/initscripts-9.05-link.patch b/initscripts-9.05-link.patch deleted file mode 100644 index e9855d4..0000000 --- a/initscripts-9.05-link.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions -index 02a024a..89baeb4 100644 ---- a/sysconfig/network-scripts/network-functions -+++ b/sysconfig/network-scripts/network-functions -@@ -253,7 +253,7 @@ check_link_down () - delay=10 - [ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2)) - while [ $timeout -le $delay ]; do -- [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" = "1" ] && return 1 -+ [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" != "0" ] && return 1 - usleep 500000 - timeout=$((timeout+1)) - done diff --git a/initscripts.spec b/initscripts.spec index 57de21d..bb15c0c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,14 +2,13 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.05 +Version: 9.06 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.1 +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 -Patch: initscripts-9.05-link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -37,6 +36,7 @@ Conflicts: tcsh < 6.13-5 Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 Conflicts: plymouth < 0.7.0-0.2009.02.26 +Conflicts: s390utils < 2:1.8.2-11 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 Obsoletes: hotplug @@ -64,7 +64,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch -p1 %build make @@ -86,8 +85,6 @@ rm -f $RPM_BUILD_ROOT/etc/inittab.* %ifnarch s390 s390x rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \ - $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \ - $RPM_BUILD_ROOT/lib/udev/ccw_init %else rm -f \ $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \ @@ -214,9 +211,6 @@ rm -rf $RPM_BUILD_ROOT /lib/udev/rename_device /lib/udev/console_init /lib/udev/console_check -%ifarch s390 s390x -/lib/udev/ccw_init -%endif /sbin/service /sbin/ppp-watch %{_mandir}/man*/* @@ -245,6 +239,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Feb 19 2010 Bill Nottingham - 9.06-1 +- move ccw_init and ccw udev rules to s390utils (#539491) +- rc.sysinit: suppress LVM2 warnings. (#561938, ) +- fix translated checks for user input (#566579) +- refresh translations + * Mon Feb 15 2010 Bill Nottingham - 9.05-1 - network-functions: don't use ethtool for link state, assorted other cleanups - inittab: fix job paths in comments () diff --git a/sources b/sources index 4a18de3..d174f15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58ff8a7a09537155cbaf09b3a8e7b25f initscripts-9.05.tar.bz2 +0e1ee1b1b77eb77c44b382e5b3e6d98c initscripts-9.06.tar.bz2