plymouth: Update to 0.8.5.1.

This version contains the first time it's own systemd files.

Fixes #10173.

diff --git a/plymouth/patches/plymouth-no-gtk.patch b/plymouth/patches/plymouth-no-gtk.patch
index e9bf703acfd6a032eb9fe29dbd9551ab23fcd81b..49ab5fc2e7a488f520364c5b9a2c0122aeae40cc 100644 (file)
--- a/plymouth/patches/plymouth-no-gtk.patch
+++ b/plymouth/patches/plymouth-no-gtk.patch
@@ -1,7 +1,7 @@
-diff -Nur plymouth-0.8.4.orig/configure.ac plymouth-0.8.4/configure.ac
---- plymouth-0.8.4.orig/configure.ac   2011-03-31 02:45:20.000000000 +0000
-+++ plymouth-0.8.4/configure.ac        2011-11-04 10:12:55.436686905 +0000
-@@ -52,10 +52,6 @@
+diff -Nur a/configure.ac b/configure.ac
+--- a/configure.ac     2012-06-06 22:21:53.000000000 +0200
++++ b/configure.ac     2012-06-30 20:55:30.743597988 +0200
+@@ -53,10 +53,6 @@
    AC_SUBST(PANGO_LIBS)
  fi
  
@@ -9,24 +9,23 @@ diff -Nur plymouth-0.8.4.orig/configure.ac plymouth-0.8.4/configure.ac
 -AC_SUBST(GTK_CFLAGS)
 -AC_SUBST(GTK_LIBS)
 -
- AC_ARG_ENABLE(libdrm_intel, AS_HELP_STRING([--enable-libdrm_intel],[enable building with libdrm_intel support]),enable_libdrm_intel=$enableval,enable_libdrm_intel=yes)
+ AC_ARG_ENABLE(libdrm_intel, AS_HELP_STRING([--enable-libdrm_intel],[enable building with libdrm_intel support]),enable_libdrm_intel=$enableval,enable_libdrm_intel=no)
  AM_CONDITIONAL(ENABLE_LIBDRM_INTEL,  [test "$enable_libdrm_intel" = yes])
  
-diff -Nur plymouth-0.8.4.orig/src/Makefile.am plymouth-0.8.4/src/Makefile.am
---- plymouth-0.8.4.orig/src/Makefile.am        2011-03-31 02:48:57.000000000 +0000
-+++ plymouth-0.8.4/src/Makefile.am     2011-11-04 10:13:42.687191109 +0000
+diff -Nur a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am  2012-06-06 16:14:49.000000000 +0200
++++ b/src/Makefile.am  2012-06-30 20:56:29.714189945 +0200
 @@ -1,4 +1,4 @@
 -SUBDIRS = libply libply-splash-core libply-splash-graphics . plugins client viewer tests
 +SUBDIRS = libply libply-splash-core libply-splash-graphics . plugins client tests
  if ENABLE_UPSTART_MONITORING
  SUBDIRS += upstart-bridge
  endif
-diff -Nur plymouth-0.8.4.orig/src/plugins/renderers/Makefile.am plymouth-0.8.4/src/plugins/renderers/Makefile.am
---- plymouth-0.8.4.orig/src/plugins/renderers/Makefile.am      2011-02-01 19:22:26.000000000 +0000
-+++ plymouth-0.8.4/src/plugins/renderers/Makefile.am   2011-11-04 10:14:15.185225691 +0000
+diff -Nur a/src/plugins/renderers/Makefile.am b/src/plugins/renderers/Makefile.am
+--- a/src/plugins/renderers/Makefile.am        2012-06-06 16:14:54.000000000 +0200
++++ b/src/plugins/renderers/Makefile.am        2012-06-30 20:56:59.811483344 +0200
 @@ -1,3 +1,3 @@
 -SUBDIRS = frame-buffer x11 drm
 +SUBDIRS = frame-buffer drm
  
  MAINTAINERCLEANFILES = Makefile.in
-

diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 5ac833458f271d249cffc3ec2267aa99fe3168f2..2e53c8a9057cfed12bd7621e015799b0b57fabfe 100644 (file)
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = plymouth
-version    = 0.8.4
-release    = 3
+version    = 0.8.5.1
+release    = 1
 
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/Plymouth
@@ -101,6 +101,10 @@ packages
                        initscripts
                end
 
+               conflicts
+                       systemd-units < 185-3
+               end
+
                configfiles
                        /etc/plymouth/plymouthd.conf
                end
@@ -110,6 +114,19 @@ packages
                                cp -f %{datadir}/plymouth/default-boot-duration \
                                        %{localstatedir}/lib/plymouth/boot-duration
                        fi
+
+                       # Just search for new unit files that were just installed.
+                       /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               # Reload systemd after update.
+               script postup
+                       /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               # Tell systemd that unitfiles have been removed.
+               script postun
+                       /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
                end
 
                script posttransin