Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl

This commit is contained in:
Brian Behlendorf 2009-10-05 13:11:54 -07:00
commit e1206c7a76
2 changed files with 2 additions and 2 deletions

View File

@ -206,7 +206,7 @@ Version: %{version}
Release: %{release} Release: %{release}
License: @LICENSE@ License: @LICENSE@
URL: git://eris.llnl.gov/zfs.git 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 Source: @PACKAGE@-%{version}.tar.gz
Requires: %{krequires} Requires: %{krequires}
Requires: %{splrequires} Requires: %{splrequires}

View File

@ -10,7 +10,7 @@ Version: %{version}
Release: %{release} Release: %{release}
License: CDDL License: CDDL
URL: git://eris.llnl.gov/zfs.git 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 Source: %{name}-%{version}.tar.gz
Requires: zlib Requires: zlib
BuildRequires: zlib-devel BuildRequires: zlib-devel