From 86753cd606b3f2bc19da62ca28ee065212c2673174dee41612cacd6289ffe2de Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Thu, 28 Jul 2011 10:59:10 +0000
Subject: [PATCH] Accepting request 77329 from
 home:a_jaeger:branches:openSUSE:Factory

Update to v31 - to not push into factory yet

OBS-URL: https://build.opensuse.org/request/show/77329
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=163
---
 systemd-30.tar.bz2 |  3 ---
 systemd-31.tar.bz2 |  3 +++
 systemd-rpmlintrc  |  4 +++-
 systemd.changes    |  8 ++++++++
 systemd.spec       | 18 +++++++++++++++---
 5 files changed, 29 insertions(+), 7 deletions(-)
 delete mode 100644 systemd-30.tar.bz2
 create mode 100644 systemd-31.tar.bz2

diff --git a/systemd-30.tar.bz2 b/systemd-30.tar.bz2
deleted file mode 100644
index ddfece5d..00000000
--- a/systemd-30.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10f6fffe45fab4c2985267fad25781eb51aa07a216541443806cf7da7f616bb7
-size 868377
diff --git a/systemd-31.tar.bz2 b/systemd-31.tar.bz2
new file mode 100644
index 00000000..6e5d49f0
--- /dev/null
+++ b/systemd-31.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63475cecd244a4b30ae83ecee3bf2c5f353f12f9f33a2026e218dbfd7d6afd46
+size 877404
diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc
index 59cfd1a7..52cf4c05 100644
--- a/systemd-rpmlintrc
+++ b/systemd-rpmlintrc
@@ -4,4 +4,6 @@ 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")
-
+# Do not enable for submission into openSUSE:Factory, 
+# just for testing
+setBadness('polkit-unauthorized-privilege', 1)
\ No newline at end of file
diff --git a/systemd.changes b/systemd.changes
index 06bf6e11..a35c294b 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul 28 07:27:32 UTC 2011 - aj@suse.de
+
+- Update to version 31:
+  * rewrite of enable/disable code: New features systemctl --runtime,
+    systemctl mask, systemctl link and presets.
+  * sd-daemon is now shared library.
+
 -------------------------------------------------------------------
 Tue Jul 19 11:56:43 UTC 2011 - aj@suse.de
 
diff --git a/systemd.spec b/systemd.spec
index 2384823a..1b7a4ac0 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -21,8 +21,8 @@
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        30
-Release:        1
+Version:        31
+Release:        3
 License:        GPLv2+
 Group:          System/Base
 Summary:        A System and Session Manager
@@ -159,6 +159,7 @@ ln -s systemd-random-seed-load.service %{buildroot}/lib/systemd/system/random.se
 %post
 /bin/systemd-machine-id-setup >/dev/null 2>&1 || :
 /bin/systemctl daemon-reexec >/dev/null 2>&1 || :
+/sbin/ldconfig
 
 # Create default config in /etc at first install.
 # Later package updates should not overwrite these settings.
@@ -176,6 +177,8 @@ if [ "$1" -eq 1 ]; then
     remote-fs.target >/dev/null 2>&1 || :
 fi
 
+%postun -p /sbin/ldconfig
+
 %preun
 if [ $1 -eq 0 ]; then
   /bin/systemctl disable \
@@ -202,6 +205,8 @@ rm -rf %{buildroot}
 /usr/bin/systemd-nspawn
 /usr/bin/systemd-stdio-bridge
 /usr/bin/systemd-analyze
+%{_libdir}/libsystemd-daemon.so.*
+%{_libdir}/libsystemd-login.so.*
 %{_bindir}/systemd-cgls
 /lib/systemd/systemd-*
 %dir /lib/systemd/system-shutdown
@@ -242,7 +247,6 @@ rm -rf %{buildroot}
 %{_datadir}/polkit-1
 %{_datadir}/polkit-1/actions
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
-%{_datadir}/pkgconfig/systemd.pc
 %if %{build_plymouth}
 # Packaged in plymouth subpackage
 %exclude /lib/systemd/system/plymouth-*.service
@@ -274,6 +278,14 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/systemd
 %dir %{_sysconfdir}/bash_completion.d
 /etc/bash_completion.d/systemctl-bash-completion.sh
+# The following files might go into a devel package
+%{_includedir}/systemd/
+%{_datadir}/pkgconfig/systemd.pc
+%{_libdir}/pkgconfig/libsystemd-daemon.pc
+%{_libdir}/pkgconfig/libsystemd-login.pc
+%{_libdir}/libsystemd-daemon.so
+%{_libdir}/libsystemd-login.so
+
 
 %files gtk
 %defattr(-,root,root,-)