Use @ZFS_META LICENSE@ in spec.in files

[zfs.git] / zfs.spec.in

diff --git a/zfs.spec.in b/zfs.spec.in
index 08ea483..5f94f37 100644 (file)
--- a/zfs.spec.in
+++ b/zfs.spec.in
@@ -2,14 +2,19 @@
 %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 _includedir      /usr/include
+%define _udevdir         /lib/udev

 
 Summary:         ZFS Library and Utils
 Group:           Utilities/System
 Name:            %{name}
 Version:         %{version}
 Release:         %{release}
 
 Summary:         ZFS Library and Utils
 Group:           Utilities/System
 Name:            %{name}
 Version:         %{version}
 Release:         %{release}

-License:         CDDL
-URL:             git://eris.llnl.gov/zfs.git
+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
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un)
 Source:          %{name}-%{version}.tar.gz
 Requires:        zlib e2fsprogs


@@ -37,6 +42,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

 
 %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


@@ -44,10 +50,19 @@ can be used to simplfy the benchmarking of various hardware and software
 configurations.  The test infrastructure additionally integrates with
 various system profiling tools to facilitate an in depth analysis.
 
 configurations.  The test infrastructure additionally integrates with
 various system profiling tools to facilitate an in depth analysis.
 

+%package dracut
+Summary:         ZFS Dracut Module
+Group:           System Environment/Base
+Requires:        dracut
+
+%description dracut
+The %{name}-dracut package allows dracut to construct initramfs images
+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


@@ -66,9 +81,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*
 %{_mandir}/man8/*
 %{_sysconfdir}/init.d/*
 %{_libdir}/*
 %{_mandir}/man8/*
 %{_sysconfdir}/init.d/*

-%{_sysconfdir}/udev/rules.d/*

 %{_sysconfdir}/zfs/*
 %{_sysconfdir}/zfs/*

-/sbin/*
+%{_udevdir}/*

 
 %files devel
 %defattr(-,root,root)
 
 %files devel
 %defattr(-,root,root)


@@ -78,10 +92,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_libexecdir}/@PACKAGE@/*
 
 %defattr(-,root,root)
 %{_libexecdir}/@PACKAGE@/*
 

+%files dracut
+%defattr(-,root,root)
+%{_datadir}/dracut/*
+

 %post
 [ -x /sbin/chkconfig ] && /sbin/chkconfig --add zfs
 exit 0
 
 %preun
 %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
 exit 0