Accepting request 126933 from Base:System

- Provides systemd units, instead of relying on systemd to ship
  them (bnc#769397).
- Ensure plymouth--wait-quit.service conflicts with
  graphical.target. (forwarded request 126896 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/126933
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=16

plymouth.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul  2 11:19:04 UTC 2012 - fcrozat@suse.com
+
+- Provides systemd units, instead of relying on systemd to ship
+  them (bnc#769397).
+- Ensure plymouth--wait-quit.service conflicts with
+  graphical.target.
+
 -------------------------------------------------------------------
 Fri Jun 29 08:35:41 UTC 2012 - tittiatcoke@gmail.com
 

plymouth.spec

@@ -39,6 +39,8 @@ Patch1:         suse-initrd-support
 Patch2:         plymouth-trace-lines
 # PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes
 Patch3:         plymouth-fix-window-size
+# PATCH-OPENSUSE -- Ensure graphical.target is conflicting with plymouth-wait-quit.service
+Patch4:         stop-graphical.patch
 BuildRequires:  automake
 BuildRequires:  kernel-headers
 BuildRequires:  libtool
@@ -52,12 +54,14 @@ BuildRequires:  pkgconfig(libkms)
 Requires:       %{name}-branding
 Requires:       gnu-unifont-bitmap-fonts
 Requires:       suspend >= 0.80.20100129.1
-Requires:       systemd-plymouth
+Requires:       systemd >= 44
 Requires(post): plymouth-scripts
 Requires(post): mkinitrd
 Suggests:       plymouth-plugin-label
 Provides:       bootsplash = 3.4
 Obsoletes:      bootsplash <= 3.4
+Provides:       systemd-plymouth = 44-10.2
+Obsoletes:      systemd-plymouth <= 44-10.1
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -316,6 +320,7 @@ plugin.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # replace builddate with patch0date
 sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
@@ -349,9 +354,6 @@ rm -f %{buildroot}/%{_bindir}/rhgb-client
 rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-generate-initrd
 rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-populate-initrd
 
-# For now the systemd integration is still being delivered through the systemd packages
-rm -rf %{buildroot}/lib/systemd
-
 #Link the plymouth client binary also to /bin until the move to /usr is completed
 mkdir %{buildroot}/bin
 (cd %{buildroot}/bin; ln -s ../usr/bin/plymouth)
@@ -507,6 +509,7 @@ fi
 %{_localstatedir}/spool/plymouth
 %{_mandir}/man?/*
 %ghost %{_localstatedir}/lib/plymouth/boot-duration
+/lib/systemd/system/*
 
 %files devel
 %defattr(-, root, root)

stop-graphical.patch

@@ -0,0 +1,12 @@
+Index: plymouth-0.8.5.1/systemd-units/plymouth-quit-wait.service.in
+===================================================================
+--- plymouth-0.8.5.1.orig/systemd-units/plymouth-quit-wait.service.in
++++ plymouth-0.8.5.1/systemd-units/plymouth-quit-wait.service.in
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=Wait for Plymouth Boot Screen to Quit
+ After=rc-local.service plymouth-start.service systemd-user-sessions.service
++Conflicts=graphical.target
+ 
+ [Service]
+ ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait