X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=zfs.spec.in;h=3e784ecdabd22330555b311ac2310da0b1375162;hb=e07b579b1b487eec772ec9394eefaad264c779fb;hp=3a57fd8773640fd0d2363fa3afe8be6b0c9b71fb;hpb=db97f88646b0d59e8e3db9144006491fb2192854;p=zfs.git

diff --git a/zfs.spec.in b/zfs.spec.in
index 3a57fd8..3e784ec 100644
--- a/zfs.spec.in
+++ b/zfs.spec.in
@@ -2,21 +2,21 @@
 %define version          @VERSION@
 %define release          @ZFS_META_RELEASE@
 %define debug_package    %{nil}
-%define _prefix          /
-%define _bindir          /lib/udev
-%define _libexecdir      /usr/libexec
-%define _datadir         /usr/share
+%define _sbindir         /sbin
+%define _libdir          /%{_lib}
+%define _udevdir         /lib/udev
+%define _dracutdir       %{_datadir}/dracut
 
 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
-Requires:        zlib e2fsprogs
+Requires:        zfs-modules spl zlib e2fsprogs
 BuildRequires:   zlib-devel e2fsprogs-devel
 
 %description
@@ -27,10 +27,10 @@ for the zfs file system.
 Summary:         ZFS File System User Headers
 Group:           Development/Libraries
 %if %{defined ch5} || %{defined el6} || %{defined fc12}
-Requires:        zlib libuuid libblkid
+Requires:        zfs zlib libuuid libblkid
 BuildRequires:   zlib-devel libuuid-devel libblkid-devel
 %else
-Requires:        zlib e2fsprogs
+Requires:        zfs zlib e2fsprogs
 BuildRequires:   zlib-devel e2fsprogs-devel
 %endif
 
@@ -41,7 +41,7 @@ additional applications against the %{name} libraries.
 %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
@@ -52,7 +52,7 @@ various system profiling tools to facilitate an in depth analysis.
 %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
@@ -61,7 +61,10 @@ which are ZFS aware.
 %prep
 %setup
 %build
-%configure --with-config=user --without-blkid
+%configure --with-config=user \
+           --without-blkid \
+           --with-udevdir=%{_udevdir} \
+           --with-dracutdir=%{_dracutdir}
 make
 
 %install
@@ -73,15 +76,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER
-%doc OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE
 %{_sbindir}/*
-%{_bindir}/*
 %{_libdir}/*
+%{_mandir}/man5/*
 %{_mandir}/man8/*
-%{_sysconfdir}/init.d/*
-%{_sysconfdir}/udev/rules.d/*
-%{_sysconfdir}/zfs/*
+%{_udevdir}/*
+
+%config %{_sysconfdir}/init.d/*
+%config %{_sysconfdir}/zfs/*
+
+%doc AUTHORS COPYING COPYRIGHT DISCLAIMER
+%doc OPENSOLARIS.LICENSE README.markdown
 
 %files devel
 %defattr(-,root,root)
@@ -89,16 +94,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files test
 %defattr(-,root,root)
-%{_libexecdir}/@PACKAGE@/*
+%{_datadir}/@PACKAGE@/*
 
 %files dracut
 %defattr(-,root,root)
-%{_datadir}/dracut/*
+%{_dracutdir}/*
 
 %post
 [ -x /sbin/chkconfig ] && /sbin/chkconfig --add zfs
 exit 0
 
 %preun
-[ -x /sbin/chkconfig ] && /sbin/chkconfig --del zfs
+[ "$1" = 0 ] && [ -x /sbin/chkconfig ] && /sbin/chkconfig --del zfs
 exit 0