diff --git a/.gitignore b/.gitignore index fddf6d3..3f4cb25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/initscripts-9.38.tar.bz2 -/initscripts-9.39.tar.bz2 -/initscripts-9.40.tar.bz2 -/initscripts-9.41.tar.bz2 +/initscripts-9.42.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 030bc86..675debc 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,10 +1,10 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.41 +Version: 9.42 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 2%{?dist} +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -30,8 +30,6 @@ Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig -Patch0: d7cc6f6.patch -Patch1: 0001-Fix-calling-of-firewall-cmd-in-ifup-post-ifdown-post.patch %description The initscripts package contains the basic system scripts used to boot @@ -52,8 +50,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build make @@ -172,6 +168,7 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/rc.d/init.d /etc/rc.d/init.d/* %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local +%config(noreplace) /etc/sysctl.conf /usr/lib/sysctl.d/00-system.conf %exclude /etc/profile.d/debug* /etc/profile.d/* @@ -217,9 +214,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Mon Oct 8 2012 Bill Nottingham - 9.41-2 -- fix invocation of firewall-cmd for current firewalld (#864060, ) -- fix invocation of fixfiles in autorelabel (#863662, ) +* Wed Oct 31 2012 Bill Nottingham - 9.42-1 +- Halloween release! +- add a default /etc/sysctl.conf that describes how to change values, and where the defaults now live. (#760254) +- translation updates +- fedora-autorelabel: don't pass -F to fixfiles (#863662, ) +- fix calling of firewall-cmd in ifup-post/ifdown-post () * Fri Oct 5 2012 Bill Nottingham - 9.41-1 - debugmode: MALLOC_CHECK_ is not thread safe. Don't enable it by default (#853175) diff --git a/sources b/sources index 4cc50ff..6d7eb18 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -9b6d7413e08fe199acf4e9e5e6729f28 initscripts-9.38.tar.bz2 -52617e27a4f49303028039c43c0721c9 initscripts-9.39.tar.bz2 -a6244271db03b0274f9b9582b1ac86d3 initscripts-9.40.tar.bz2 -06645d3346db593604b7d78428963103 initscripts-9.41.tar.bz2 +d5bde672cc94973cd8af8ac0354dbe8f initscripts-9.42.tar.bz2