Resolves: 241389

This commit is contained in:
Tomas Smetana 2007-06-21 13:26:38 +00:00
parent 9c270d73b3
commit 7dcc630e86
2 changed files with 38 additions and 21 deletions

View File

@ -2,7 +2,7 @@
# smartmontools init file for smartd # smartmontools init file for smartd
# Copyright (C) 2002-4 Bruce Allen <smartmontools-support@lists.sourceforge.net> # Copyright (C) 2002-4 Bruce Allen <smartmontools-support@lists.sourceforge.net>
# $Id: smartd.initd,v 1.4 2006/11/07 10:19:40 tmraz Exp $ # $Id: smartd.initd,v 1.5 2007/06/21 13:26:38 tsmetana Exp $
# For RedHat and cousins: # For RedHat and cousins:
# chkconfig: 2345 99 01 # chkconfig: 2345 99 01
@ -35,11 +35,13 @@ SMARTD_BIN=/usr/sbin/smartd
case "$1" in case "$1" in
start | reload | restart) start | reload | restart)
GEN_CONF="*SMARTD*AUTOGENERATED*" if [ -x /usr/sbin/smartd-conf.py ]; then
[ ! -f /etc/smartd.conf ] || read DUMMY GEN_CONF DUMMY </etc/smartd.conf \ GEN_CONF="*SMARTD*AUTOGENERATED*"
&& [ "$GEN_CONF" == "*SMARTD*AUTOGENERATED*" ] \ [ ! -f /etc/smartd.conf ] || read DUMMY GEN_CONF DUMMY </etc/smartd.conf \
&& smartd-conf.py 2>/dev/null >/etc/smartd.conf.new-autogenerated \ && [ "$GEN_CONF" == "*SMARTD*AUTOGENERATED*" ] \
&& mv -f /etc/smartd.conf.new-autogenerated /etc/smartd.conf && smartd-conf.py 2>/dev/null >/etc/smartd.conf.new-autogenerated \
&& mv -f /etc/smartd.conf.new-autogenerated /etc/smartd.conf
fi
;; ;;
esac esac

View File

@ -1,7 +1,7 @@
Summary: Tools for monitoring SMART capable hard disks Summary: Tools for monitoring SMART capable hard disks
Name: smartmontools Name: smartmontools
Version: 5.37 Version: 5.37
Release: 3%{?dist} Release: 4%{?dist}
Epoch: 1 Epoch: 1
Group: System Environment/Base Group: System Environment/Base
License: GPL License: GPL
@ -14,7 +14,7 @@ Patch1: smartmontools-5.37-cloexec.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
PreReq: /sbin/chkconfig /sbin/service PreReq: /sbin/chkconfig /sbin/service
Requires: fileutils hal >= 0.5.2 dbus-python >= 0.33 mailx Requires: fileutils mailx
BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf util-linux groff gettext BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf util-linux groff gettext
Obsoletes: kernel-utils Obsoletes: kernel-utils
ExclusiveArch: i386 x86_64 ia64 ppc ppc64 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
@ -27,6 +27,15 @@ into most modern ATA and SCSI hard disks. In many cases, these
utilities will provide advanced warning of disk degradation and utilities will provide advanced warning of disk degradation and
failure. failure.
%package config
Group: System Environment/Base
Summary: The smartmontools configuration script
Requires: %{name} = %{epoch}:%{version}-%{release} hal >= 0.5.2 dbus-python >= 0.33
%description config
This package provides a smartd-conf.py script that helps to create
the /etc/smartd.conf configuration file.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .cloexec %patch1 -p1 -b .cloexec
@ -49,19 +58,6 @@ install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontoo
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc AUTHORS CHANGELOG COPYING INSTALL NEWS README
%doc TODO WARNINGS examplescripts smartd.conf
%{_sbindir}/smartd
%{_sbindir}/smartctl
%{_sbindir}/smartd-conf.py
%exclude %{_sbindir}/smartd-conf.py[co]
%{_sysconfdir}/rc.d/init.d/smartd
%{_mandir}/man?/smart*.*
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/smartd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
%preun %preun
if [ "$1" = "0" ] ; then if [ "$1" = "0" ] ; then
/sbin/service smartd stop >/dev/null 2>&1 /sbin/service smartd stop >/dev/null 2>&1
@ -76,8 +72,27 @@ exit 0
/sbin/chkconfig --add smartd /sbin/chkconfig --add smartd
exit 0 exit 0
%files
%defattr(-,root,root)
%doc AUTHORS CHANGELOG COPYING INSTALL NEWS README
%doc TODO WARNINGS examplescripts smartd.conf
%{_sbindir}/smartd
%{_sbindir}/smartctl
%{_sysconfdir}/rc.d/init.d/smartd
%{_mandir}/man?/smart*.*
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/smartd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
%files config
%defattr(-,root,root)
%{_sbindir}/smartd-conf.py
%exclude %{_sbindir}/smartd-conf.py[co]
%changelog %changelog
* Thu Jun 21 2007 Tomas Smetana <tsmetana@redhat.com> - 1:5.37-4
- fix #241389 - smartd-conf.py pulls in a big dependency chain, so
build a separate config package
* Tue Jun 05 2007 Tomas Smetana <tsmetana@redhat.com> - 1:5.37-3 * Tue Jun 05 2007 Tomas Smetana <tsmetana@redhat.com> - 1:5.37-3
- fix #241385 - smartmontools missing dependency on mailx - fix #241385 - smartmontools missing dependency on mailx
- fix #241388 - unneeded smartd-conf.py[co] installed in /usr/sbin - fix #241388 - unneeded smartd-conf.py[co] installed in /usr/sbin