From c40cc0ab2ea4cac64af45334f8d499283e528a7278ef02ff73e42b320d96f625 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon, 2 May 2011 17:09:04 +0000
Subject: [PATCH] disable plymouth

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=138
---
 systemd.changes |  5 +++++
 systemd.spec    | 37 +++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/systemd.changes b/systemd.changes
index cb857d77..5e7c7cff 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 2 19:00:41 CEST 2011 - kay.sievers@novell.com
+
+- disable plymouth sub-package until plymouth gets into Factory
+
 -------------------------------------------------------------------
 Sun May 1 22:51:28 CEST 2011 - kay.sievers@novell.com
 
diff --git a/systemd.spec b/systemd.spec
index d0788430..394dd884 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -81,15 +81,15 @@ Conflicts:      upstart
 %description sysvinit
 Drop-in replacement of System V init tools.
 
-%package plymouth
-License:        GPLv2+
-Group:          System/Base
-Summary:        Plymouth support for systemd
-Requires:       %{name} = %{version}-%{release}
-Requires:       plymouth
-
-%description plymouth
-Plymouth integration for systemd
+#%package plymouth
+#License:        GPLv2+
+#Group:          System/Base
+#Summary:        Plymouth support for systemd
+#Requires:       %{name} = %{version}-%{release}
+#Requires:       plymouth
+#
+#%description plymouth
+#Plymouth integration for systemd
 
 %prep
 %setup -q
@@ -139,7 +139,7 @@ ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/localnet.service
 ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/proc.service
 ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/swap.service
 
-(cd $RPM_BUILD_ROOT && find . -name '*plymouth*') > files.plymouth
+#(cd $RPM_BUILD_ROOT && find . -name '*plymouth*') > files.plymouth
 
 %post
 /bin/systemd-machine-id-setup >/dev/null 2>&1 || :
@@ -190,6 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/systemd-analyze
 %{_bindir}/systemd-cgls
 /lib/systemd/systemd-*
+%dir /lib/systemd/system-shutdown
 /%{_lib}/security/pam_systemd.so
 %dir %{_sysconfdir}/systemd/system
 %dir %{_sysconfdir}/systemd/user
@@ -217,9 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
 %{_datadir}/pkgconfig/systemd.pc
 # Packaged in plymouth subpackage
-%exclude /lib/systemd/system/plymouth-*.service
-%exclude /lib/systemd/system/*.wants/plymouth-*.service
-%exclude /lib/systemd/system/systemd-ask-password-plymouth.*
+#%exclude /lib/systemd/system/plymouth-*.service
+#%exclude /lib/systemd/system/*.wants/plymouth-*.service
+#%exclude /lib/systemd/system/systemd-ask-password-plymouth.*
 # Packaged in gtk subpackage
 %exclude %{_mandir}/man1/systemadm.1*
 # Packaged in sysvinit subpackage
@@ -252,11 +253,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/systemd-gnome-ask-password-agent
 %{_mandir}/man1/systemadm.1*
 
-%files plymouth
-%defattr(-,root,root,-)
-/lib/systemd/system/plymouth-*.service
-/lib/systemd/system/*.wants/plymouth-*.service
-/lib/systemd/system/systemd-ask-password-plymouth.*
+#%files plymouth
+#%defattr(-,root,root,-)
+#/lib/systemd/system/plymouth-*.service
+#/lib/systemd/system/*.wants/plymouth-*.service
+#/lib/systemd/system/systemd-ask-password-plymouth.*
 
 %files sysvinit
 %defattr(-,root,root,-)