json-glib: New package.

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

diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 55e17209f31637762332317a62577bebe7e5dcd2..cbecf07f8a0c960436d0a8a5771a8eecda225953 100644 (file)
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = plymouth
-version    = 0.8.5.1
-release    = 3
+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 \
@@ -87,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