From 1e87fc835028db651cca323dce5d2b45720da098102283cdd1cc28843eeb701f Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Mon, 2 Jul 2012 12:13:41 +0000
Subject: [PATCH] - Do not ship plymouth units, they are shipped by plymouth
 package   now (bnc#769397).

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=280
---
 systemd.changes |  6 ++++++
 systemd.spec    | 23 ++---------------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/systemd.changes b/systemd.changes
index 102a346..7402525 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  2 11:32:23 UTC 2012 - fcrozat@suse.com
+
+- Do not ship plymouth units, they are shipped by plymouth package
+  now (bnc#769397).
+
 -------------------------------------------------------------------
 Thu Jun  7 13:14:40 UTC 2012 - fcrozat@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index cace496..f670c1a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -82,7 +82,6 @@ Patch31:        lock-opensuse.patch
 Patch33:        crypt-loop-file.patch
 Patch36:        sysctl-modules.patch
 Patch38:        dm-lvm-after-local-fs-pre-target.patch
-Patch39:        correct_plymouth_paths_and_conflicts.patch
 Patch41:        0001-add-sparse-support-to-detect-endianness-bug.patch
 
 # Upstream First - Policy:
@@ -125,15 +124,6 @@ Provides:       sysvinit:/sbin/init
 %description sysvinit
 Drop-in replacement of System V init tools.
 
-%package plymouth
-Summary:        Plymouth support for systemd
-Group:          System/Base
-Requires:       %{name} = %{version}
-Requires:       plymouth
-
-%description plymouth
-Plymouth integration for systemd
-
 %prep
 %setup -q
 %patch1 -p1
@@ -152,7 +142,6 @@ Plymouth integration for systemd
 %patch33 -p1
 %patch36 -p1
 %patch38 -p1
-%patch39 -p1
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
@@ -166,6 +155,7 @@ autoreconf -fiv
 find . -name "*.[1-8]" -exec touch '{}' \;
 touch src/systemadm.c
 export V=1
+# disable plymouth at configure time, units are shipped in plymouth package now
 %configure \
   --with-distro=suse \
   --docdir=%{_docdir}/systemd \
@@ -173,6 +163,7 @@ export V=1
   --with-pamlibdir=/%{_lib}/security \
   --enable-split-usr \
   --disable-gtk \
+  --disable-plymouth \
   CFLAGS="%{optflags}"
 make %{?_smp_mflags}
 
@@ -350,10 +341,6 @@ rm -rf %{buildroot}
 %{_datadir}/polkit-1/actions
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
 %{_datadir}/systemd
-# 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.*
 # Packaged in gtk subpackage
 %exclude %{_mandir}/man1/systemadm.1*
 # Packaged in sysvinit subpackage
@@ -404,12 +391,6 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libsystemd-id128.pc
 %{_libdir}/pkgconfig/libsystemd-journal.pc
 
-%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,-)
 /sbin/init