json-glib: New package.

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

diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index c46ceb71c4fb5b9ca0f45bdb6ec0301833837a97..cbecf07f8a0c960436d0a8a5771a8eecda225953 100644 (file)
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = plymouth
-version    = 0.8.4
-release    = 2
+version    = 0.8.8
+release    = 1
 
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/Plymouth
@@ -37,12 +37,7 @@ build
 
        enable_libdrm_intel = 0
 
-       if "%{DISTRO_MACHINE}" == "x86_64"
-               enable_libdrm_intel = 1
-               requires += pkgconfig(libdrm_intel)
-       end
-
-       if "%{DISTRO_MACHINE}" == "i686"
+       if "%{DISTRO_PLATFORM}" == "x86"
                enable_libdrm_intel = 1
                requires += pkgconfig(libdrm_intel)
        end
@@ -51,6 +46,8 @@ build
 
        configure_options += \
                --libexecdir=/usr/lib \
+               --disable-libkms \
+               --disable-gtk \
                --enable-tracing \
                --disable-tests \
                --with-logo=%{datadir}/pixmaps/system-logo-white.png \
@@ -71,6 +68,10 @@ build
                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
@@ -101,6 +102,10 @@ packages
                        initscripts
                end
 
+               conflicts
+                       systemd-units < 185-3
+               end
+
                configfiles
                        /etc/plymouth/plymouthd.conf
                end
@@ -110,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