Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2013-03-01 10:54:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plymouth", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2013-02-07 10:46:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2013-03-01 10:54:03.000000000 +0100 @@ -1,0 +2,12 @@ +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 + +------------------------------------------------------------------- New: ---- plymouth-correct-runtime-dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.XJdwEo/_old 2013-03-01 10:54:04.000000000 +0100 +++ /var/tmp/diff_new_pack.XJdwEo/_new 2013-03-01 10:54:04.000000000 +0100 @@ -53,6 +53,8 @@ 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 @@ %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 '*.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,10 +423,16 @@ %postun -n libply2 -p /sbin/ldconfig %post theme-spinfinity -if [ $1 -eq 1 -a ! -e /.buildenv ]; then +if [ $1 -eq 1 ]; then + set -x export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then + 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 @@ -436,10 +445,16 @@ fi %post theme-fade-in -if [ $1 -eq 1 -a ! -e /.buildenv ]; then +if [ $1 -eq 1 ]; then + set -x export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then + 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 @@ -452,10 +467,16 @@ fi %post theme-solar -if [ $1 -eq 1 -a ! -e /.buildenv ]; then +if [ $1 -eq 1 ]; then + set -x export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then + 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 @@ -492,7 +513,7 @@ %{_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 ++++++ plymouth-correct-runtime-dir.patch ++++++ --- 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) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org