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 5ac833458f271d249cffc3ec2267aa99fe3168f2..257aef63fad0067bbb9f0f3a1dc762555b2550f1 100644 (file)
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = plymouth
-version    = 0.8.4
-release    = 3
+version    = 0.9.0
+release    = 1
 
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/Plymouth
@@ -27,30 +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_MACHINE}" == "x86_64"
-               enable_libdrm_intel = 1
-               requires += pkgconfig(libdrm_intel)
-       end
-
-       if "%{DISTRO_MACHINE}" == "i686"
-               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 \
@@ -63,14 +51,14 @@ build
                --without-rhgb-compat-link \
                --without-log-viewer
 
-       if "%{enable_libdrm_intel}" == "0"
-               configure_options += --disable-libdrm_intel
-       end
-
        prepare_cmds
                autoreconf -vfi
        end
 
+       # Fix install location for systemd files.
+       make_install_targets += \
+               SYSTEMD_UNIT_DIR=%{unitdir}
+
        install_cmds
                mkdir -pv %{BUILDROOT}%{datadir}/plymouth
                mkdir -pv %{BUILDROOT}%{localstatedir}/lib/plymouth
@@ -79,10 +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
+               # 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
 
@@ -101,6 +89,10 @@ packages
                        initscripts
                end
 
+               conflicts
+                       systemd-units < 185-3
+               end
+
                configfiles
                        /etc/plymouth/plymouthd.conf
                end
@@ -110,15 +102,26 @@ 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
 
-               script posttransin
-                       /usr/lib/plymouth/plymouth-generate-initrd >/dev/null 2>&1
+               # 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 || :
+
                        rm -f /boot/initrd-plymouth.img
                end
+
+               script posttransin
+                       /usr/lib/plymouth/plymouth-generate-initrd >/dev/null 2>&1
+               end
        end
 
        package %{name}-libs
@@ -261,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