Accepting request 156887 from Base:System

Improved %post scripts for when triggered within the build environment. Also it will use not /run/plymouth instead of /var/run

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

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)

plymouth.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Feb 28 21:13:14 UTC 2013 - tittiatcoke@gmail.com
+
+- Changed %post scripts so only the rebuild of the initrd is 
+  omitted within the build environment
+
+-------------------------------------------------------------------
+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
 

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
@@ -420,11 +423,17 @@ fi
 %postun -n libply2 -p /sbin/ldconfig
 
 %post theme-spinfinity
-if [ $1 -eq 1 -a ! -e /.buildenv ]; then
-   export LIB=%{_libdir}
-   if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
-      %{_sbindir}/plymouth-set-default-theme -R spinfinity
-   fi
+if [ $1 -eq 1 ]; then
+  set -x
+  export LIB=%{_libdir}
+  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
+  if [ "$OTHEME" == "text" ]; then
+     if [ ! -e /.buildenv ]; then
+       %{_sbindir}/plymouth-set-default-theme -R spinfinity
+     else
+       %{_sbindir}/plymouth-set-default-theme spinfinity
+     fi 
+  fi
 fi
 
 %postun theme-spinfinity
@@ -436,11 +445,17 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post theme-fade-in
-if [ $1 -eq 1 -a ! -e /.buildenv ]; then
-   export LIB=%{_libdir}
-   if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
-      %{_sbindir}/plymouth-set-default-theme -R fade-in
-   fi
+if [ $1 -eq 1 ]; then
+  set -x
+  export LIB=%{_libdir}
+  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
+  if [ "$OTHEME" == "text" ]; then
+     if [ ! -e /.buildenv ]; then
+       %{_sbindir}/plymouth-set-default-theme -R fade-in
+     else
+       %{_sbindir}/plymouth-set-default-theme fade-in
+     fi 
+  fi
 fi
 
 %postun theme-fade-in
@@ -452,11 +467,17 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post theme-solar
-if [ $1 -eq 1 -a ! -e /.buildenv ]; then
-   export LIB=%{_libdir}
-   if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
-      %{_sbindir}/plymouth-set-default-theme -R solar
-   fi
+if [ $1 -eq 1 ]; then
+  set -x
+  export LIB=%{_libdir}
+  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
+  if [ "$OTHEME" == "text" ]; then
+     if [ ! -e /.buildenv ]; then
+       %{_sbindir}/plymouth-set-default-theme -R solar
+     else
+       %{_sbindir}/plymouth-set-default-theme solar
+     fi 
+  fi
 fi
 
 %postun theme-solar
@@ -492,7 +513,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