Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
505d26fb5b
|
@ -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}
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue