plymouth: Update to 0.9.0.

[people/ms/ipfire-3.x.git] / plymouth / plymouth.nm

diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index cee24a2f44f83ffdf1649816fd90ee6f547aae2b..257aef63fad0067bbb9f0f3a1dc762555b2550f1 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.9.0
+release    = 1
 
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/Plymouth
@@ -27,26 +27,18 @@ build
                autoconf
                automake
                cairo-devel
+               docbook-xsl
                glib2-devel
                pkgconfig(libdrm)
-               pkgconfig(libdrm_radeon)
-               pkgconfig(libdrm_nouveau)
                libpng-devel
+               libudev-devel
                pango-devel
        end
 
-       enable_libdrm_intel = 0
-
-       if "%{DISTRO_PLATFORM}" == "x86"
-               enable_libdrm_intel = 1
-               requires += pkgconfig(libdrm_intel)
-       end
-
-       CFLAGS += -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-
        configure_options += \
                --libexecdir=/usr/lib \
                --disable-libkms \
+               --disable-gtk \
                --enable-tracing \
                --disable-tests \
                --with-logo=%{datadir}/pixmaps/system-logo-white.png \
@@ -59,10 +51,6 @@ build
                --without-rhgb-compat-link \
                --without-log-viewer
 
-       if "%{enable_libdrm_intel}" == "0"
-               configure_options += --disable-libdrm_intel
-       end
-
        prepare_cmds
                autoreconf -vfi
        end
@@ -79,27 +67,10 @@ build
                cp -vf %{DIR_SOURCE}/boot-duration \
                        %{BUILDROOT}%{localstatedir}/lib/plymouth
 
-               # Override plymouth-update-initrd to work dracut or mkinitrd
-               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
+               # The "glow" theme isn't quite ready for primetime, so drop it.
+               rm -rvf %{BUILDROOT}%{datadir}/plymouth/themes/glow
+               rm -rvf %{BUILDROOT}%{datadir}/plymouth/glow/
+               rm -rvf %{BUILDROOT}%{libdir}/plymouth/glow.so
        end
 end
 
@@ -293,7 +264,7 @@ packages
                end
 
                script postun
-                       if [ "$(%{sbindir}/plymouth-set-default-theme)" = %{theme_name}" ]; then
+                       if [ "$(%{sbindir}/plymouth-set-default-theme)" = "%{theme_name}" ]; then
                                %{sbindir}/plymouth-set-default-theme --reset
                                /usr/lib/plymouth/plymouth-generate-initrd
                        fi