plymouth: Update to 0.8.8.

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

diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 7d77e6f3955c7190eb9b7a1dcbd18898ce3149a6..cbecf07f8a0c960436d0a8a5771a8eecda225953 100644 (file)
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = plymouth
-version    = 0.8.4
+version    = 0.8.8
 release    = 1
 
 groups     = System/Base
@@ -29,17 +29,25 @@ build
                cairo-devel
                glib2-devel
                pkgconfig(libdrm)
-               pkgconfig(libdrm_intel)
                pkgconfig(libdrm_radeon)
                pkgconfig(libdrm_nouveau)
                libpng-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 \
@@ -52,10 +60,18 @@ 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
@@ -86,6 +102,10 @@ packages
                        initscripts
                end
 
+               conflicts
+                       systemd-units < 185-3
+               end
+
                configfiles
                        /etc/plymouth/plymouthd.conf
                end
@@ -95,15 +115,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