Add conditional chkconfig to packaging

[zfs.git] / rpm / generic / zfs.spec.in

diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index 05d55d9..77f217d 100644 (file)
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -28,6 +28,7 @@ ExclusiveArch:  i386 i686 x86_64
 # May build but untested on ppc/ppc64
 ExcludeArch:    ppc ppc64
 
+Requires:       spl = %{version}
 Requires:       %{name}-kmod >= %{version}
 Provides:       %{name}-kmod-common = %{version}
 
@@ -112,7 +113,14 @@ make %{?_smp_mflags}
 make install DESTDIR=%{?buildroot}
 find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+[ -x /sbin/chkconfig ] && /sbin/chkconfig --add zfs
+
+%preun
+if [ $1 -eq 0 ] ; then
+    [ -x /sbin/chkconfig ] && /sbin/chkconfig --del zfs
+fi
 
 %postun -p /sbin/ldconfig
 
@@ -120,6 +128,7 @@ find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
 %doc AUTHORS COPYRIGHT DISCLAIMER
 %doc OPENSOLARIS.LICENSE README.markdown
 %{_sbindir}/*
+%{_bindir}/*
 %{_libdir}/*.so.1*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -128,8 +137,7 @@ find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
 %{_udevdir}/zvol_id
 %{_udevdir}/rules.d/*
 %config(noreplace) %{_sysconfdir}/%{name}
-# Systemd integration is still required.
-%exclude %{_sysconfdir}/init.d/*
+%{_sysconfdir}/init.d/*
 
 %files devel
 %{_libdir}/*.so
@@ -143,5 +151,5 @@ find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
 %{_dracutdir}/modules.d/*
 
 %changelog
-* Tue Mar 12 2013 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.0-1
-- Refreshed RPM packaging.
+* Fri Mar 22 2013 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.1-1
+- First official stable release.