[systemd/f15/master] New upstream release

[Lennart Poettering]

commit 342c431001ec352cba678b73fef9a12bb082f47b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Mar 1 02:13:59 2011 +0100

    New upstream release

 .gitignore   |    1 +
 sources      |    2 +-
 systemd.spec |   23 ++++++++++++++++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d938a6..c3e81cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 x86_64/
 systemd-*src.rpm
 /systemd-18.tar.bz2
+/systemd-19.tar.bz2
diff --git a/sources b/sources
index fffdb1f..b83db90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42a47d6fa60b7f3fe92fa22027713b32  systemd-18.tar.bz2
+32de12b132a2f6c270d422d682362a91  systemd-19.tar.bz2
diff --git a/systemd.spec b/systemd.spec
index c471bc1..6c78391 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,7 +1,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Version:        18
+Version:        19
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Base
@@ -22,21 +22,23 @@ BuildRequires:  libnotify-devel >= 0.7
 BuildRequires:  automake
 BuildRequires:  autoconf
 BuildRequires:  libtool
+BuildRequires:  make
+Requires(post): authconfig
 Requires:       systemd-units = %{version}-%{release}
 Requires:       dbus >= 1.3.2
 Requires:       udev >= 160
 Requires:       libudev >= 160
 Requires:       initscripts >= 9.22
-Requires:       selinux-policy >= 3.8.7
+Conflicts:      selinux-policy < 3.8.7
 Requires:       kernel >= 2.6.35.2-9.fc14
 Source0:        http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2
 # Adds support for the %%{_unitdir} macro
-Source1:	macros.systemd
+Source1:        macros.systemd
 # For sysvinit tools
 Obsoletes:      SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides:       SysVinit = 2.86-24, sysvinit = 2.86-24
 Provides:       sysvinit-userspace
-Provides:	systemd-sysvinit
+Provides:       systemd-sysvinit
 Obsoletes:      systemd-sysvinit
 Obsoletes:      upstart < 0.6.5-11
 Obsoletes:      upstart-sysvinit < 0.6.5-11
@@ -102,7 +104,7 @@ ln -s ../bin/systemctl %{buildroot}/sbin/runlevel
 # them.
 rm -r %{buildroot}/etc/systemd/system/*.target.wants
 
-# Make sure the %ghost-ing below works
+# Make sure the ghost-ing below works
 touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel2.target
 touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel3.target
 touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel4.target
@@ -127,6 +129,14 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /bin/systemctl daemon-reexec > /dev/null 2>&1 || :
 
+# Make sure pam_systemd is enabled
+if ! /bin/grep -q pam_systemd /etc/pam.d/system-auth-ac ; then
+        /usr/sbin/authconfig --update >/dev/null 2>&1 || :
+
+        # Try harder
+        /bin/grep -q pam_systemd /etc/pam.d/system-auth-ac || /usr/sbin/authconfig --updateall >/dev/null 2>&1 || :
+fi
+
 %post units
 if [ $1 -eq 1 ] ; then
         # Try to read default runlevel from the old inittab if it exists
@@ -240,6 +250,9 @@ fi
 %{_mandir}/man1/systemadm.*
 
 %changelog
+* Tue Mar  1 2011 Lennart Poettering <lpoetter at redhat.com> - 19-1
+- New upstream release
+
 * Wed Feb 16 2011 Lennart Poettering <lpoetter at redhat.com> - 18-1
 - New upstream release