Ensure we install user/group using symbolic names, else rpm may barf.

Merge of master-melb:xfs-cmds:26576a by kenmcd.

diff --git a/aclocal.m4 b/aclocal.m4
index 464376366963a3334ef32f015fb3f85b62284fd9..fcb244701b2b84a0b4b6d04e61142d3a23c5a802 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -111,7 +111,7 @@ AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO],
   ])
 
 
-# 
+#
 # Generic macro, sets up all of the global packaging variables.
 # The following environment variables may be set to override defaults:
 #   DEBUG OPTIMIZER MALLOCLIB PLATFORM DISTRIBUTION INSTALL_USER INSTALL_GROUP
@@ -140,11 +140,11 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     malloc_lib="$MALLOCLIB"
     AC_SUBST(malloc_lib)
 
-    pkg_user=`id -u`
+    pkg_user=`id -u -n`
     test -z "$INSTALL_USER" || pkg_user="$INSTALL_USER"
     AC_SUBST(pkg_user)
 
-    pkg_group=`id -g`
+    pkg_group=`id -g -n`
     test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"
     AC_SUBST(pkg_group)
 

diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index 665afc8308092d49efe7ad5c000b0e7823cc1951..72fbbb78ac9e998f959d9cd96b196cebf67a6c59 100644 (file)
--- a/m4/package_globals.m4
+++ b/m4/package_globals.m4
@@ -1,4 +1,4 @@
-# 
+#
 # Generic macro, sets up all of the global packaging variables.
 # The following environment variables may be set to override defaults:
 #   DEBUG OPTIMIZER MALLOCLIB PLATFORM DISTRIBUTION INSTALL_USER INSTALL_GROUP
@@ -27,11 +27,11 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     malloc_lib="$MALLOCLIB"
     AC_SUBST(malloc_lib)
 
-    pkg_user=`id -u`
+    pkg_user=`id -u -n`
     test -z "$INSTALL_USER" || pkg_user="$INSTALL_USER"
     AC_SUBST(pkg_user)
 
-    pkg_group=`id -g`
+    pkg_group=`id -g -n`
     test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"
     AC_SUBST(pkg_group)