Accepting request 151515 from Base:System

( please forward to Factory AND 12.3)
- Rename plymouth-sd-notforking.patch to fix typo in patch name
- Add plymouth-change-service-name.patch: fix incorrect service
  names used for dependencies. Now use systemd-reboot.service
  (replacing reboot.service) and display-manager.service (replacing
  prefdm.service). (forwarded request 151492 from fcrozat)

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

plymouth-change-service-name.patch

@@ -0,0 +1,50 @@
+Index: plymouth-0.8.8_git201211022126/systemd-units/plymouth-halt.service.in
+===================================================================
+--- plymouth-0.8.8_git201211022126.orig/systemd-units/plymouth-halt.service.in
++++ plymouth-0.8.8_git201211022126/systemd-units/plymouth-halt.service.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Show Plymouth Halt Screen
+-After=getty@tty1.service prefdm.service plymouth-start.service
++After=getty@tty1.service display-manager.service plymouth-start.service
+ Before=halt.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
+Index: plymouth-0.8.8_git201211022126/systemd-units/plymouth-kexec.service.in
+===================================================================
+--- plymouth-0.8.8_git201211022126.orig/systemd-units/plymouth-kexec.service.in
++++ plymouth-0.8.8_git201211022126/systemd-units/plymouth-kexec.service.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Show Plymouth Reboot with kexec Screen
+-After=getty@tty1.service prefdm.service plymouth-start.service
++After=getty@tty1.service display-manager.service plymouth-start.service
+ Before=kexec.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
+Index: plymouth-0.8.8_git201211022126/systemd-units/plymouth-poweroff.service.in
+===================================================================
+--- plymouth-0.8.8_git201211022126.orig/systemd-units/plymouth-poweroff.service.in
++++ plymouth-0.8.8_git201211022126/systemd-units/plymouth-poweroff.service.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Show Plymouth Power Off Screen
+-After=getty@tty1.service prefdm.service plymouth-start.service
++After=getty@tty1.service display-manager.service plymouth-start.service
+ Before=poweroff.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
+Index: plymouth-0.8.8_git201211022126/systemd-units/plymouth-reboot.service.in
+===================================================================
+--- plymouth-0.8.8_git201211022126.orig/systemd-units/plymouth-reboot.service.in
++++ plymouth-0.8.8_git201211022126/systemd-units/plymouth-reboot.service.in
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Show Plymouth Reboot Screen
+-After=getty@tty1.service prefdm.service plymouth-start.service
+-Before=reboot.service
++After=getty@tty1.service display-manager.service plymouth-start.service
++Before=systemd-reboot.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
+ 

plymouth.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb  6 14:44:11 UTC 2013 - fcrozat@suse.com
+
+- Rename plymouth-sd-notforking.patch to fix typo in patch name
+- Add plymouth-change-service-name.patch: fix incorrect service
+  names used for dependencies. Now use systemd-reboot.service
+  (replacing reboot.service) and display-manager.service (replacing
+  prefdm.service).
+
 -------------------------------------------------------------------
 Tue Dec 18 15:05:47 UTC 2012 - tittiatcoke@gmail.com
 

plymouth.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package plymouth
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -47,10 +47,12 @@ Patch8:         systemd-no-warning.patch
 # PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin
 Patch9:         plymouth-dracut-path.patch
 Patch10:        0001-Some-greenish-openSUSE-colors.patch
-Patch12:        plymoith-sd-notforking.patch
+Patch12:        plymouth-sd-notforking.patch
 Patch13:        ply-sdunitdir.patch
 # PATCH-OPENSUSE -- systemd-tty-ask-password-agent is in /usr/bin now.
 Patch14:        plymouth-systemd-in-usr.patch
+# PATCH-FIX-UPSTREAM plymouth-change-service-name.patch fcrozaŧ@suse.com -- ensure correct service names are used
+Patch15:        plymouth-change-service-name.patch
 BuildRequires:  automake
 BuildRequires:  kernel-headers
 BuildRequires:  libtool
@@ -330,6 +332,7 @@ plugin.
 %if "0%(type -p systemd-tty-ask-password-agent)" == "0/usr/bin/systemd-tty-ask-password-agent"
 %patch14 -p1
 %endif
+%patch15 -p1
 # replace builddate with patch0date
 sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c