Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

diff --git a/grubby/grubby.nm b/grubby/grubby.nm
index f4fbf3b729fa803686f8c235be98588a63ff8053..33274c141353cd26f0b90b7188f8f45a1e605aee 100644 (file)
--- a/grubby/grubby.nm
+++ b/grubby/grubby.nm
@@ -5,7 +5,7 @@
 
 name       = grubby
 version    = 8.11
-release    = 2
+release    = 3
 
 groups     = System/Base
 url        = http://git.fedorahosted.org/git/grubby.git
@@ -49,6 +49,12 @@ packages
                if "%{DISTRO_PLATFORM}" == "arm"
                        requires += u-boot-tools
                end
+
+               provides
+                       /sbin/grubby
+                       /sbin/installkernel
+                       /sbin/new-kernel-pkg
+               end
        end
 
        package %{name}-debuginfo

diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 7d77e6f3955c7190eb9b7a1dcbd18898ce3149a6..c46ceb71c4fb5b9ca0f45bdb6ec0301833837a97 100644 (file)
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -5,7 +5,7 @@
 
 name       = plymouth
 version    = 0.8.4
-release    = 1
+release    = 2
 
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/Plymouth
@@ -29,13 +29,24 @@ 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_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 += \
@@ -52,6 +63,10 @@ build
                --without-rhgb-compat-link \
                --without-log-viewer
 
+       if "%{enable_libdrm_intel}" == "0"
+               configure_options += --disable-libdrm_intel
+       end
+
        prepare_cmds
                autoreconf -vfi
        end

diff --git a/samba/samba.nm b/samba/samba.nm
index 5902b9b1bc417b3e3bde8ca175098178f1924183..6403e4ce50e6bf59cf4553244d8bd9105112d89a 100644 (file)
--- a/samba/samba.nm
+++ b/samba/samba.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = samba
-version    = 3.6.3
-release    = 2
+version    = 3.6.4
+release    = 1
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons