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 7740d9422a8460ac4cc3f1ff51e1f9e7d3fce419..0c3dd10a97bbdc371e30435fedf53b3448198723 100644 (file)
--- 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 34207f626ed8ed776981b54e94fb713bf3e663dd..fcb3dcfc8a342effad991fab01b094f3f8479d6f 100644 (file)
--- 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