[initscripts/f14/master] 9.18-1

[Bill Nottingham]

commit 0970c63e3d9f59e0017de15ccc667dc25ce6b77b
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Sep 3 17:38:24 2010 -0400

    9.18-1

 .gitignore       |    1 +
 initscripts.spec |   60 ++++++++++++++++++++++++++++++++++++++++++-----------
 sources          |    3 +-
 3 files changed, 49 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93f3fb2..d93fb79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 initscripts-9.16.tar.bz2
 /initscripts-9.17.tar.bz2
+/initscripts-9.18.tar.bz2
diff --git a/initscripts.spec b/initscripts.spec
index d27d09f..ede235e 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,12 +1,14 @@
-%define with_upstart 1%{nil}
+%define _with_upstart 1
+%define _with_systemd 1
+%define _with_sysvinit 0
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.17
+Version: 9.18
 # 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
@@ -18,9 +20,15 @@ Requires: module-init-tools
 Requires: util-linux-ng >= 2.16
 Requires: bash >= 3.0
 Requires: sysvinit-tools >= 2.87
-%if with_upstart
-Requires: upstart >= 0.6.0
-%else
+Requires: sysvinit-userspace
+%if %{_with_upstart}
+Conflicts: upstart < 0.6.0
+%endif
+%if %{_with_systemd}
+Conflicts: systemd < 9-3
+Conflicts: systemd-units < 9-3
+%endif
+%if %{_with_sysvinit}
 Requires: SysVinit >= 2.85-38
 %endif
 Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find
@@ -46,7 +54,6 @@ Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, coreutils
 Requires(preun): /sbin/chkconfig
 BuildRequires: glib2-devel popt-devel gettext pkgconfig
-Patch0: cgroup.diff
 
 %description
 The initscripts package contains the basic system scripts used to boot
@@ -67,7 +74,6 @@ Currently, this consists of various memory checking code.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 make
@@ -78,12 +84,21 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi
 
 %find_lang %{name}
 
-%if with_upstart
+%if %{_with_systemd}
+ mv -f $RPM_BUILD_ROOT/etc/inittab.systemd $RPM_BUILD_ROOT/etc/inittab
+%endif
+%if %{_with_upstart}
  mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab
-%else
+%endif
+%if %{_with_sysvinit}
  mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab
+%endif
+%if ! %{_with_upstart}
  rm -rf $RPM_BUILD_ROOT/etc/init
 %endif
+%if ! %{_with_systemd}
+ rm -rf $RPM_BUILD_ROOT/etc/systemd $RPM_BUILD_ROOT/lib/systemd
+%endif
 rm -f $RPM_BUILD_ROOT/etc/inittab.*
 
 %ifnarch s390 s390x
@@ -107,6 +122,11 @@ chmod 600 /var/log/btmp
 /sbin/chkconfig --add netfs
 /sbin/chkconfig --add network
 /sbin/chkconfig --add netconsole
+%if %{_with_systemd}
+if [ $1 -eq 1 ]; then
+        /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+fi
+%endif
 
 %preun
 if [ $1 = 0 ]; then
@@ -120,6 +140,14 @@ fi
 /sbin/chkconfig --del rawdevices
 exit 0
 
+%if %{_with_systemd}
+%postun
+if [ $1 -ge 1 ]; then
+	/bin/systemctl daemon-reload > /dev/null 2>&1 || :
+fi
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -180,9 +208,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rwtab.d
 /etc/statetab
 %dir /etc/statetab.d
-%if with_upstart
+%if %{_with_upstart}
 /etc/init/*
 %endif
+%if %{_with_systemd}
+%config(noreplace) /etc/systemd/system/*
+/lib/systemd/system/*
+%endif
 %config /etc/X11/prefdm
 %config(noreplace) /etc/inittab
 %dir /etc/rc.d
@@ -244,8 +276,10 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
-* Thu Aug 26 2010 Bill Nottingham <notting at redhat.com> - 9.17-2
-- halt: fix umount on halt for new cgroup location. (#612789)
+* Fri Sep  3 2010 Bill Nottingham <notting at redhat.com> - 9.18-1
+- fix for new cgroups location (#612789, others <plautrba at redhat.com>)
+- add in basic systemd units
+- translation updates: nb, pt, sv
 
 * Wed Aug 25 2010 Bill Nottingham <notting at redhat.com> - 9.17-1
 - init.d/functions: redirect start/stop/condrestart/etc to systemctl in a systemd environment (#612728)
diff --git a/sources b/sources
index dbbbcc9..6922fa1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-209304d2eab7dd5a35f99ae53162dccf  initscripts-9.16.tar.bz2
-3f4f0ad98657a05a7f272bc015d5205f  initscripts-9.17.tar.bz2
+1383f0341df08d77c60b496769e305fe  initscripts-9.18.tar.bz2