Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2013-08-01 17:14:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2013-06-28 18:55:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2013-08-01 17:14:37.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 29 16:23:21 UTC 2013 - [email protected] + +- Add upstream patch plymouth-correct-systemd-prefix.patch to + correct the systemd prefixes in some systemd files. This replaces + the sed string. + +------------------------------------------------------------------- New: ---- plymouth-correct-systemd-prefix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.8yjf2d/_old 2013-08-01 17:14:37.000000000 +0200 +++ /var/tmp/diff_new_pack.8yjf2d/_new 2013-08-01 17:14:37.000000000 +0200 @@ -53,6 +53,8 @@ Patch20: plymouth-exit-code.patch # PATCH-FIX-UPSTREAM plymouth-terminal-session-close.patch [email protected] -- do not close already closed terminal session fd Patch21: plymouth-terminal-session-close.patch +# PATCH-FIX-UPSTREAM plymouth-correct-systemd-prefix.patch [email protected] -- Use the correct systemd prefixes +Patch22: plymouth-correct-systemd-prefix.patch BuildRequires: automake BuildRequires: kernel-headers BuildRequires: libtool @@ -329,6 +331,7 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c @@ -383,8 +386,6 @@ mkdir -p %{buildroot}/lib/mkinitrd/scripts install -t %{buildroot}/lib/mkinitrd/scripts \ scripts/{setup,boot}-plymouth*.sh -find %{buildroot} -type f -name "*.service" -print -exec sed -i -e '[email protected]@display-manager.service@g' \ --e 's@\<\(reboot\|halt\|poweroff\|kexec\).service\>@systemd-\1.service@g' {} + %post if [ ! -e /.buildenv ]; then ++++++ plymouth-correct-systemd-prefix.patch ++++++ >From 53f6b44e11cf552e67fb3b45f480eb55dbf2a975 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <[email protected]> Date: Mon, 29 Jul 2013 15:41:30 +0000 Subject: systemd units: halt/reboot/kexec/power systemd unit have changed names Ensure we use the new 'systemd-' prefixed names now. --- diff -urB a/systemd-units/plymouth-halt.service.in b/systemd-units/plymouth-halt.service.in --- a/systemd-units/plymouth-halt.service.in 2013-04-16 14:48:40.000000000 +0200 +++ b/systemd-units/plymouth-halt.service.in 2013-08-01 14:42:02.645779224 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Show Plymouth Halt Screen [email protected] prefdm.service plymouth-start.service -Before=halt.service +Before=systemd-halt.service DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 diff -urB a/systemd-units/plymouth-kexec.service.in b/systemd-units/plymouth-kexec.service.in --- a/systemd-units/plymouth-kexec.service.in 2013-04-16 14:48:40.000000000 +0200 +++ b/systemd-units/plymouth-kexec.service.in 2013-08-01 14:42:20.097780068 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Show Plymouth Reboot with kexec Screen [email protected] prefdm.service plymouth-start.service -Before=kexec.service +Before=systemd-kexec.service DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 diff -urB a/systemd-units/plymouth-poweroff.service.in b/systemd-units/plymouth-poweroff.service.in --- a/systemd-units/plymouth-poweroff.service.in 2013-04-16 14:48:40.000000000 +0200 +++ b/systemd-units/plymouth-poweroff.service.in 2013-08-01 14:42:38.393780954 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Show Plymouth Power Off Screen [email protected] prefdm.service plymouth-start.service -Before=poweroff.service +Before=systemd-poweroff.service DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 diff -urB a/systemd-units/plymouth-reboot.service.in b/systemd-units/plymouth-reboot.service.in --- a/systemd-units/plymouth-reboot.service.in 2013-04-16 14:48:40.000000000 +0200 +++ b/systemd-units/plymouth-reboot.service.in 2013-08-01 14:43:17.673782855 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Show Plymouth Reboot Screen [email protected] prefdm.service plymouth-start.service -Before=reboot.service +Before=systemd-reboot.service DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
