git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix using zvol as slog device
[zfs.git]
/
zfs.spec.in
diff --git
a/zfs.spec.in
b/zfs.spec.in
index
be87e1d
..
ef68281
100644
(file)
--- a/
zfs.spec.in
+++ b/
zfs.spec.in
@@
-2,17
+2,23
@@
%define version @VERSION@
%define release @ZFS_META_RELEASE@
%define debug_package %{nil}
%define version @VERSION@
%define release @ZFS_META_RELEASE@
%define debug_package %{nil}
+%define _prefix /
+%define _libexecdir /usr/libexec
+%define _datadir /usr/share
+%define _mandir %{_datadir}/man
+%define _includedir /usr/include
+%define _udevdir /lib/udev
Summary: ZFS Library and Utils
Group: Utilities/System
Name: %{name}
Version: %{version}
Summary: ZFS Library and Utils
Group: Utilities/System
Name: %{name}
Version: %{version}
-Release: %{release}
-License:
CDDL
-URL: git://
eris.llnl.gov
/zfs.git
+Release: %{release}
%{?dist}
+License:
@ZFS_META_LICENSE@
+URL: git://
github.com/zfsonlinux
/zfs.git
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un)
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un)
Source: %{name}-%{version}.tar.gz
-Requires: zlib e2fsprogs
+Requires: z
fs-modules spl z
lib e2fsprogs
BuildRequires: zlib-devel e2fsprogs-devel
%description
BuildRequires: zlib-devel e2fsprogs-devel
%description
@@
-23,10
+29,10
@@
for the zfs file system.
Summary: ZFS File System User Headers
Group: Development/Libraries
%if %{defined ch5} || %{defined el6} || %{defined fc12}
Summary: ZFS File System User Headers
Group: Development/Libraries
%if %{defined ch5} || %{defined el6} || %{defined fc12}
-Requires: zlib libuuid libblkid
+Requires: z
fs z
lib libuuid libblkid
BuildRequires: zlib-devel libuuid-devel libblkid-devel
%else
BuildRequires: zlib-devel libuuid-devel libblkid-devel
%else
-Requires: zlib e2fsprogs
+Requires: z
fs z
lib e2fsprogs
BuildRequires: zlib-devel e2fsprogs-devel
%endif
BuildRequires: zlib-devel e2fsprogs-devel
%endif
@@
-37,7
+43,7
@@
additional applications against the %{name} libraries.
%package test
Summary: ZFS File System Test Infrastructure
Group: Utilities/System
%package test
Summary: ZFS File System Test Infrastructure
Group: Utilities/System
-Requires:
parted lsscsi
+Requires:
zfs parted lsscsi mdadm bc
%description test
The %{name}-test package contains a test infrastructure for zpios which
%description test
The %{name}-test package contains a test infrastructure for zpios which
@@
-48,7
+54,7
@@
various system profiling tools to facilitate an in depth analysis.
%package dracut
Summary: ZFS Dracut Module
Group: System Environment/Base
%package dracut
Summary: ZFS Dracut Module
Group: System Environment/Base
-Requires: dracut
+Requires:
zfs
dracut
%description dracut
The %{name}-dracut package allows dracut to construct initramfs images
%description dracut
The %{name}-dracut package allows dracut to construct initramfs images
@@
-57,7
+63,7
@@
which are ZFS aware.
%prep
%setup
%build
%prep
%setup
%build
-%configure --with-config=user --without-blkid
+%configure --with-config=user --without-blkid
--with-udevdir=%{_udevdir}
make
%install
make
%install
@@
-69,16
+75,19
@@
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%files
%defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER
-%doc OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE
%{_sbindir}/*
%{_bindir}/*
%{_libdir}/*
%{_sbindir}/*
%{_bindir}/*
%{_libdir}/*
+%{_mandir}/man5/*
%{_mandir}/man8/*
%{_mandir}/man8/*
-%{_sysconfdir}/init.d/*
-%{_sysconfdir}/udev/rules.d/*
-%{_sysconfdir}/zfs/*
-/sbin/*
+%{_udevdir}/*
+
+%config %{_sysconfdir}/init.d/*
+%config %{_sysconfdir}/zfs/*
+%config(noreplace) %{_sysconfdir}/zfs/zdev.conf
+
+%doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER
+%doc OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE
%files devel
%defattr(-,root,root)
%files devel
%defattr(-,root,root)
@@
-97,5
+106,5
@@
rm -rf $RPM_BUILD_ROOT
exit 0
%preun
exit 0
%preun
-[ -x /sbin/chkconfig ] && /sbin/chkconfig --del zfs
+[
"$1" = 0 ] && [
-x /sbin/chkconfig ] && /sbin/chkconfig --del zfs
exit 0
exit 0