plymouth: Update to 0.8.6.1.

This release fixes a lot of problems with systemd.
Apply a patch to create and link plymouth systemd services files and targets.

diff --git a/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch b/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch
new file mode 100644 (file)
index 0000000..1e1aa95
--- /dev/null
+++ b/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch
@@ -0,0 +1,71 @@
+From edde4e0f2b85c6f298569fe219a08361b99b016b Mon Sep 17 00:00:00 2001
+From: Frederic Crozat <fcrozat@suse.com>
+Date: Fri, 20 Jul 2012 13:28:31 +0000
+Subject: systemd: create missing links various targets
+
+---
+diff --git a/systemd-units/Makefile.am b/systemd-units/Makefile.am
+index 1545a04..2f5e61f 100644
+--- a/systemd-units/Makefile.am
++++ b/systemd-units/Makefile.am
+@@ -13,6 +13,58 @@ systemd_unit_templates =                                                     \
+ if ENABLE_SYSTEMD_INTEGRATION
+ systemdunitdir=$(SYSTEMD_UNIT_DIR)
+ systemdunit_DATA = $(systemd_unit_templates:.in=)
++
++install-data-hook:
++      $(MKDIR_P) -m 0755                                                   \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants           \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants        \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants            \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants             \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants          \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants &&            \
++              rm -f plymouth-start.service plymouth-read-write.service &&  \
++              $(LN_S) ../plymouth-start.service &&                         \
++              $(LN_S) ../plymouth-read-write.service)
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants &&         \
++              rm -f plymouth-quit.service plymouth-quit-wait.service &&    \
++              $(LN_S) ../plymouth-quit.service &&                          \
++              $(LN_S) ../plymouth-quit-wait.service)
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants &&             \
++              rm -f plymouth-reboot.service &&                             \
++              $(LN_S) ../plymouth-reboot.service)
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants &&              \
++              rm -f plymouth-kexec.service &&                              \
++              $(LN_S) ../plymouth-kexec.service)
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants &&           \
++              rm -f plymouth-poweroff.service &&                           \
++              $(LN_S) ../plymouth-poweroff.service)
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants &&               \
++              rm -f plymouth-halt.service &&                               \
++              $(LN_S) ../plymouth-halt.service)
++
++uninstall-hook:
++      rm -f \
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants &&            \
++              rm -f plymouth-start.service plymouth-read-write.service)    \
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants &&         \
++              rm -f plymouth-quit.service plymouth-quit-wait.service)      \
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants &&             \
++              rm -f plymouth-reboot.service)                               \
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants &&              \
++              rm -f plymouth-kexec.service)                                \
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants &&           \
++              rm -f plymouth-poweroff.service)                             \
++      (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants &&               \
++              rm -f plymouth-halt.service)                                 \
++      rmdir --ignore-fail-on-non-empty                                     \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants           \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants        \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants            \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants             \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants          \
++              $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants
++
+ endif
+ 
+ EXTRA_DIST = $(systemd_unit_templates) $(systemdunit_DATA)
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/plymouth/patches/plymouth-no-gtk.patch b/plymouth/patches/plymouth-no-gtk.patch
deleted file mode 100644 (file)
index 49ab5fc..0000000
--- a/plymouth/patches/plymouth-no-gtk.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
- 
--PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.12.0 ])
--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=no)
- AM_CONDITIONAL(ENABLE_LIBDRM_INTEL,  [test "$enable_libdrm_intel" = yes])
- 
-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 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 cee24a2f44f83ffdf1649816fd90ee6f547aae2b..96507de39c09a3d5ee5055011611b95f369131eb 100644 (file)
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = plymouth
-version    = 0.8.5.1
-release    = 4
+version    = 0.8.6.1
+release    = 1
 
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/Plymouth
@@ -47,6 +47,7 @@ build
        configure_options += \
                --libexecdir=/usr/lib \
                --disable-libkms \
+               --disable-gtk \
                --enable-tracing \
                --disable-tests \
                --with-logo=%{datadir}/pixmaps/system-logo-white.png \
@@ -83,23 +84,6 @@ build
                cp -vf %{DIR_SOURCE}/plymouth-update-initrd \
                        %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd
                chmod 755 %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd
-
-               # XXX - may we can remove this at a later time.
-               #
-               # Enable plymouth systemd service files and link them to the correct targets.
-               mkdir -pv %{BUILDROOT}%{unitdir}/halt.target.wants
-               mkdir -pv %{BUILDROOT}%{unitdir}/multi-user.target.wants
-               mkdir -pv %{BUILDROOT}%{unitdir}/poweroff.target.wants
-               mkdir -pv %{BUILDROOT}%{unitdir}/reboot.target.wants
-               mkdir -pv %{BUILDROOT}%{unitdir}/sysinit.target.wants
-
-               ln -svf ../plymouth-halt.service %{BUILDROOT}%{unitdir}/halt.target.wants/plymouth-halt.service
-               ln -svf ../plymouth-quit.service %{BUILDROOT}%{unitdir}/multi-user.target.wants/plymouth-quit.service
-               ln -svf ../plymouth-quit-wait.service %{BUILDROOT}%{unitdir}/multi-user.target.wants/plymouth-quit-wait.service
-               ln -svf ../plymouth-poweroff.service %{BUILDROOT}%{unitdir}/poweroff.target.wants/plymouth-poweroff.service
-               ln -svf ../plymouth-reboot.service %{BUILDROOT}%{unitdir}/reboot.target.wants/plymouth-reboot.service
-               ln -svf ../plymouth-read-write.service %{BUILDROOT}%{unitdir}/sysinit.target.wants/plymouth-read-write.service
-               ln -svf ../plymouth-start.service %{BUILDROOT}%{unitdir}/sysinit.target.wants/plymouth-start.service
        end
 end