From 6ae518ac8ec345bc67cdb18a868eb950996918659a2cb52eed5f5e3b0612517a Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Wed, 20 Jul 2011 07:12:35 +0000
Subject: [PATCH] Accepting request 76463 from Base:System

Add changes (forwarded request 76462 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/76463
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=43
---
 systemd-29.tar.bz2 |  3 ---
 systemd-30.tar.bz2 |  3 +++
 systemd-rpmlintrc  |  3 ++-
 systemd.changes    |  9 +++++++++
 systemd.spec       | 18 ++++++++++++++++--
 5 files changed, 30 insertions(+), 6 deletions(-)
 delete mode 100644 systemd-29.tar.bz2
 create mode 100644 systemd-30.tar.bz2

diff --git a/systemd-29.tar.bz2 b/systemd-29.tar.bz2
deleted file mode 100644
index b9e21e45..00000000
--- a/systemd-29.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c41153c3ebab9e25b16fa1670946ce6dfdd1515608a37eedd80d2bbe46629971
-size 810407
diff --git a/systemd-30.tar.bz2 b/systemd-30.tar.bz2
new file mode 100644
index 00000000..ddfece5d
--- /dev/null
+++ b/systemd-30.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10f6fffe45fab4c2985267fad25781eb51aa07a216541443806cf7da7f616bb7
+size 868377
diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc
index d7a7e967..59cfd1a7 100644
--- a/systemd-rpmlintrc
+++ b/systemd-rpmlintrc
@@ -1,6 +1,7 @@
 addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*")
 addFilter(".*dangling-symlink .* /dev/null.*")
-addFilter(".*suse-dbus-unauthorized-service.*")
 addFilter(".*devel-file-in-non-devel-package.*systemd.pc.*")
 addFilter(".*files-duplicate .*/reboot.8.*")
 addFilter(".*files-duplicate .*/sd_is_socket.3.*")
+addFilter(".*dbus-policy-allow-receive")
+
diff --git a/systemd.changes b/systemd.changes
index 27c95cb1..06bf6e11 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jul 19 11:56:43 UTC 2011 - aj@suse.de
+
+- Update to version 30:
+  + Logic from pam_systemd has been moved to new systemd-login.
+  + VT gettys are autospawn only when needed
+  + Handle boot.local/halt.local on SUSE distribution
+  + add support for systemctl --root
+
 -------------------------------------------------------------------
 Wed Jun 29 12:54:24 UTC 2011 - fcrozat@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index ca79b5ac..ea3e11e6 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -21,7 +21,7 @@
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        29
+Version:        30
 Release:        3
 License:        GPLv2+
 Group:          System/Base
@@ -37,7 +37,8 @@ BuildRequires:  libcryptsetup-devel
 BuildRequires:  pkg-config
 BuildRequires:  gtk2-devel libnotify-devel libxslt-devel vala
 BuildRequires:  libselinux-devel libsepol-devel
-Requires:       udev >= 167
+BuildRequires:  intltool
+Requires:       udev >= 172
 Requires:       dbus-1 >= 1.4.0
 Requires:       kbd
 Requires:       util-linux >= 2.19
@@ -194,6 +195,7 @@ rm -rf %{buildroot}
 /bin/systemctl
 /bin/systemd-notify
 /bin/systemd-ask-password
+/bin/systemd-loginctl
 /bin/systemd-tty-ask-password-agent
 /bin/systemd-tmpfiles
 /bin/systemd-machine-id-setup
@@ -219,12 +221,24 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/sysctl.d
 /usr/lib/tmpfiles.d/*.conf
 %config(noreplace) %{_sysconfdir}/systemd/system.conf
+%config(noreplace) %{_sysconfdir}/systemd/systemd-logind.conf
+%config(noreplace) %{_sysconfdir}/systemd/user.conf
+%config(noreplace) %{_sysconfdir}/systemd/system.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
+%{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.timedate1.xml
 %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
 %{_datadir}/polkit-1
 %{_datadir}/polkit-1/actions
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy