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

[people/amarx/ipfire-3.x.git] / grubby / grubby.nm

diff --git a/grubby/grubby.nm b/grubby/grubby.nm
index 830f27d878687e362c2a5c1d30d95153352aa1a0..33274c141353cd26f0b90b7188f8f45a1e605aee 100644 (file)
--- a/grubby/grubby.nm
+++ b/grubby/grubby.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = grubby
-version    = 8.9
-release    = 1
+version    = 8.11
+release    = 3
 
 groups     = System/Base
 url        = http://git.fedorahosted.org/git/grubby.git
@@ -36,17 +36,24 @@ build
        end
 
        make_install_targets += mandir=%{mandir}
+
+       install_cmds
+               mkdir -pv %{BUILDROOT}%{prefix}
+               mv -v %{BUILDROOT}{,%{prefix}}/sbin
+       end
 end
 
 packages
        package %{name}
-               # Pull in uboot-tools on ARM platforms.
-               if "%{DISTRO_ARCH}" == "armv7hl"
-                       requires += uboot-tools
+               # Pull in u-boot-tools on ARM platforms.
+               if "%{DISTRO_PLATFORM}" == "arm"
+                       requires += u-boot-tools
                end
 
-               if "%{DISTRO_ARCH}" == "armv5tel"
-                       requires += uboot-tools
+               provides
+                       /sbin/grubby
+                       /sbin/installkernel
+                       /sbin/new-kernel-pkg
                end
        end