From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 5 Oct 2009 19:51:58 +0000 (-0700)
Subject: Remove usage of the __id_u macro for portability.
X-Git-Tag: spl-0.4.6~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f44078fad5a941f2489ce0bbb8ed2c521f13f26e;p=spl

Remove usage of the __id_u macro for portability.

This macro was removed from the default RPM macro file.  Interestly,
some of the arch specific macro's add it back it based on your distro
but it should not be counted on.  However, __id still exists and its
command line args have historically been fairly stable so we will
directly use %{__id} -un to get the user name.
---

diff --git a/spl-modules.spec.in b/spl-modules.spec.in
index 7740d94..0c3dd10 100644
--- a/spl-modules.spec.in
+++ b/spl-modules.spec.in
@@ -168,7 +168,7 @@ Version:         %{version}
 Release:         %{release}
 License:         @LICENSE@
 URL:             git://eris.llnl.gov/spl.git
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un)
 Source:          @PACKAGE@-%{version}.tar.gz
 Requires:        %{requires}
 BuildRequires:   %{kdevpkg}
diff --git a/spl.spec.in b/spl.spec.in
index 34207f6..fcb3dcf 100644
--- a/spl.spec.in
+++ b/spl.spec.in
@@ -10,7 +10,7 @@ Version:         %{version}
 Release:         %{release}
 License:         @LICENSE@
 URL:             git://eris.llnl.gov/spl.git
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un)
 Source:          %{name}-%{version}.tar.gz
 
 %description