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
Readd zpool_clear_label() from OpenSolaris
[zfs.git]
/
rpm
/
generic
/
zfs.spec.in
diff --git
a/rpm/generic/zfs.spec.in
b/rpm/generic/zfs.spec.in
index
05d55d9
..
c832404
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
# May build but untested on ppc/ppc64
ExcludeArch: ppc ppc64
+Requires: spl = %{version}
Requires: %{name}-kmod >= %{version}
Provides: %{name}-kmod-common = %{version}
Requires: %{name}-kmod >= %{version}
Provides: %{name}-kmod-common = %{version}
@@
-112,7
+113,16
@@
make %{?_smp_mflags}
make install DESTDIR=%{?buildroot}
find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
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
+exit 0
+
+%preun
+if [ $1 -eq 0 ] ; then
+ [ -x /sbin/chkconfig ] && /sbin/chkconfig --del zfs
+fi
+exit 0
%postun -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@
-120,6
+130,7
@@
find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
%doc AUTHORS COPYRIGHT DISCLAIMER
%doc OPENSOLARIS.LICENSE README.markdown
%{_sbindir}/*
%doc AUTHORS COPYRIGHT DISCLAIMER
%doc OPENSOLARIS.LICENSE README.markdown
%{_sbindir}/*
+%{_bindir}/*
%{_libdir}/*.so.1*
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_libdir}/*.so.1*
%{_mandir}/man1/*
%{_mandir}/man5/*
@@
-128,8
+139,7
@@
find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
%{_udevdir}/zvol_id
%{_udevdir}/rules.d/*
%config(noreplace) %{_sysconfdir}/%{name}
%{_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
%files devel
%{_libdir}/*.so
@@
-143,5
+153,5
@@
find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
%{_dracutdir}/modules.d/*
%changelog
%{_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
.