From b615df53c8b47f503b1fa69e48af4e6eb00b9b19 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 5 Oct 2009 13:01:01 -0700 Subject: [PATCH] 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. --- zfs-modules.spec.in | 2 +- zfs.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zfs-modules.spec.in b/zfs-modules.spec.in index 09956b3abf..9b5e4716d9 100644 --- a/zfs-modules.spec.in +++ b/zfs-modules.spec.in @@ -206,7 +206,7 @@ Version: %{version} Release: %{release} License: @LICENSE@ URL: git://eris.llnl.gov/zfs.git -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un) Source: @PACKAGE@-%{version}.tar.gz Requires: %{krequires} Requires: %{splrequires} diff --git a/zfs.spec.in b/zfs.spec.in index 9419b34a32..87093ea590 100644 --- a/zfs.spec.in +++ b/zfs.spec.in @@ -10,7 +10,7 @@ Version: %{version} Release: %{release} License: CDDL URL: git://eris.llnl.gov/zfs.git -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un) Source: %{name}-%{version}.tar.gz Requires: zlib BuildRequires: zlib-devel