Update to v208submit/tizen/20131203.225031submit/tizen/20131122.225324accepted/tizen/20131206.003824accepted/tizen/20131203.230113accepted/tizen/20131125.231848

Fixes an issue with IVI bootup: TIVI-2197

Change-Id: I9ab660a9babd2e160aef2f441c6824a49d43f4c6
Signed-off-by: Patrick McCarty <patrick.mccarty@linux.intel.com>

2 files changed, 18 insertions, 2 deletions

diff --git a/packaging/systemd.changes b/packaging/systemd.changes
index ca5f324ca7..ed551e1676 100644
--- a/packaging/systemd.changes
+++ b/packaging/systemd.changes
@@ -1,3 +1,6 @@
+* Thu Nov 21 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> d1373b6
+- Update to v208 (TIVI-2197)
+
 * Sat Nov 16 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> 4c21d4e
 - Remove temporary, permissive set of Smack rules (PTREL-109)
 
diff --git a/packaging/systemd.spec b/packaging/systemd.spec
index 3987db45f6..3ab2eeb2a4 100644
--- a/packaging/systemd.spec
+++ b/packaging/systemd.spec
@@ -1,5 +1,5 @@
 Name:           systemd
-Version:        204
+Version:        208
 Release:        0
 # For a breakdown of the licensing, see README
 License:        LGPL-2.0+ and MIT and GPL-2.0+
@@ -16,7 +16,7 @@ BuildRequires:  libacl-devel
 BuildRequires:  libblkid-devel >= 2.20
 BuildRequires:  libcap-devel
 BuildRequires:  libgcrypt-devel
-BuildRequires:  libkmod-devel >= 5
+BuildRequires:  libkmod-devel >= 14
 BuildRequires:  libxslt
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
@@ -200,6 +200,11 @@ rm -rf %{buildroot}/%{_prefix}/lib/systemd/user/default.target
 
 rm -rf %{buildroot}/%{_docdir}/%{name}
 
+# Move macros to the proper location for Tizen
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+install -m644 src/core/macros.systemd %{buildroot}%{_sysconfdir}/rpm/macros.systemd
+rm -f %{buildroot}%{_prefix}/lib/rpm/macros.d/macros.systemd
+
 %pre
 /usr/bin/getent group cdrom >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 11 cdrom >/dev/null 2>&1 || :
 /usr/bin/getent group tape >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 33 tape >/dev/null 2>&1 || :
@@ -245,8 +250,11 @@ fi
 %files
 %manifest %{name}.manifest
 %{_sysconfdir}/systemd/bootchart.conf
+%config %{_sysconfdir}/pam.d/systemd-user
 %{_bindir}/bootctl
 %{_bindir}/kernel-install
+%{_bindir}/machinectl
+%{_bindir}/systemd-run
 %dir %{_prefix}/lib/kernel
 %dir %{_prefix}/lib/kernel/install.d
 %{_prefix}/lib/kernel/install.d/50-depmod.install
@@ -264,6 +272,8 @@ fi
 %dir %{_sysconfdir}/modules-load.d
 %dir %{_sysconfdir}/binfmt.d
 %{_datadir}/bash-completion/*
+%dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/site-functions/*
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d
 %dir %{_prefix}/lib/systemd
@@ -286,6 +296,7 @@ fi
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
 %config(noreplace) %{_sysconfdir}/systemd/system.conf
 %config(noreplace) %{_sysconfdir}/systemd/user.conf
 %config(noreplace) %{_sysconfdir}/systemd/logind.conf
@@ -343,6 +354,7 @@ fi
 %{_prefix}/lib/systemd/system-generators/systemd-getty-generator
 %{_prefix}/lib/systemd/system-generators/systemd-fstab-generator
 %{_prefix}/lib/systemd/system-generators/systemd-system-update-generator
+%{_prefix}/lib/systemd/system-generators/systemd-gpt-auto-generator
 %{_prefix}/lib/tmpfiles.d/systemd.conf
 %{_prefix}/lib/tmpfiles.d/x11.conf
 %{_prefix}/lib/tmpfiles.d/tmp.conf
@@ -363,6 +375,7 @@ fi
 %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
 %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml