Raymond Wooninck 2013-08-01 14:15:38 +00:00 committed by Git OBS Bridge
parent e06ea812fd
commit c90418a7c4
5 changed files with 10 additions and 64 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9edd55b792972325b2596520b75e07dd27655ee066ce483e2ec0cb000ddae5bd
size 792324

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79048030d2ecd17d9a3d8cdf12fbdfe04dad1e607d44214f2aab49f5456c03f4
size 4630532

View File

@ -1,57 +0,0 @@
From 53f6b44e11cf552e67fb3b45f480eb55dbf2a975 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
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
After=getty@tty1.service 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
After=getty@tty1.service 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
After=getty@tty1.service 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
After=getty@tty1.service 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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 1 14:08:53 UTC 2013 - tittiatcoke@gmail.com
- Update to version 0.8.8_git201308011340
- Drop patch plymouth-correct-systemd-prefix.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 29 16:23:21 UTC 2013 - tittiatcoke@gmail.com Mon Jul 29 16:23:21 UTC 2013 - tittiatcoke@gmail.com

View File

@ -22,7 +22,7 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img %define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth Name: plymouth
Version: 0.8.8_git201304161248 Version: 0.8.8_git201308011340
Release: 0 Release: 0
Summary: Graphical Boot Animation and Logger Summary: Graphical Boot Animation and Logger
License: GPL-2.0+ License: GPL-2.0+
@ -53,8 +53,6 @@ Patch19: plymouth-redirect-null.patch
Patch20: plymouth-exit-code.patch Patch20: plymouth-exit-code.patch
# PATCH-FIX-UPSTREAM plymouth-terminal-session-close.patch fcrozat@suse.com -- do not close already closed terminal session fd # PATCH-FIX-UPSTREAM plymouth-terminal-session-close.patch fcrozat@suse.com -- do not close already closed terminal session fd
Patch21: plymouth-terminal-session-close.patch Patch21: plymouth-terminal-session-close.patch
# PATCH-FIX-UPSTREAM plymouth-correct-systemd-prefix.patch tittiatcoke@gmail.com -- Use the correct systemd prefixes
Patch22: plymouth-correct-systemd-prefix.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: kernel-headers BuildRequires: kernel-headers
BuildRequires: libtool BuildRequires: libtool
@ -331,7 +329,6 @@ plugin.
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1 %patch21 -p1
%patch22 -p1
# replace builddate with patch0date # replace builddate with patch0date
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c