From 8bf715315259cd2c511f745c79c3a9113e3781a852b339d5e2ba06755348fef6 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 22 Feb 2013 16:24:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=100 --- plymouth-correct-runtime-dir.patch | 11 +++++++++++ plymouth.changes | 6 ++++++ plymouth.spec | 7 +++++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 plymouth-correct-runtime-dir.patch diff --git a/plymouth-correct-runtime-dir.patch b/plymouth-correct-runtime-dir.patch new file mode 100644 index 0000000..d5cd1ec --- /dev/null +++ b/plymouth-correct-runtime-dir.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2012-11-02 22:26:41.000000000 +0100 ++++ b/configure.ac 2013-02-22 17:15:58.300689336 +0100 +@@ -268,7 +268,7 @@ + else + plymouthclientdir=$bindir + plymouthdaemondir=$sbindir +- plymouthruntimedir=$localstatedir/run/plymouth ++ plymouthruntimedir=/run/plymouth + fi + AC_SUBST(plymouthclientdir) + AC_SUBST(plymouthdaemondir) diff --git a/plymouth.changes b/plymouth.changes index 2ddefa8..4648621 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 22 16:20:54 UTC 2013 - tittiatcoke@gmail.com + +- Added patch plymouth-correct-runtime-dir.patch to make the + plymouthruntimedir equal to /run/plymouth and not /var/run/plymouth + ------------------------------------------------------------------- Wed Feb 6 14:44:11 UTC 2013 - fcrozat@suse.com diff --git a/plymouth.spec b/plymouth.spec index e058263..d0a0088 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -53,6 +53,8 @@ Patch13: ply-sdunitdir.patch 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 +# PATCH-OPENSUSE -- plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com -- make sure the runtime directory is /run and not /var/run +Patch16: plymouth-correct-runtime-dir.patch BuildRequires: automake BuildRequires: kernel-headers BuildRequires: libtool @@ -333,6 +335,7 @@ plugin. %patch14 -p1 %endif %patch15 -p1 +%patch16 -p1 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c @@ -376,7 +379,7 @@ find %{buildroot} -name '*.a' -exec rm -f {} \; find %{buildroot} -name '*.la' -exec rm -f {} \; mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth -mkdir -p %{buildroot}%{_localstatedir}/run/plymouth +mkdir -p %{buildroot}/run/plymouth cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouth.conf @@ -492,7 +495,7 @@ fi %{_datadir}/plymouth/themes/text/text.plymouth %{_datadir}/plymouth/plymouthd.defaults %{_datadir}/plymouth/bizcom.png -%ghost %{_localstatedir}/run/plymouth +%ghost /run/plymouth %{_localstatedir}/spool/plymouth %{_mandir}/man?/* %ghost %{_localstatedir}/lib/plymouth/boot-duration