rpms/smartmontools/devel smartd.initd, 1.4, 1.5 smartmontools.spec, 1.32, 1.33

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/smartmontools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14863

Modified Files:
	smartd.initd smartmontools.spec 
Log Message:
Resolves: 241389


Index: smartd.initd
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartd.initd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smartd.initd	7 Nov 2006 10:19:40 -0000	1.4
+++ smartd.initd	21 Jun 2007 13:26:38 -0000	1.5
@@ -35,11 +35,13 @@
 
 case "$1" in
     start | reload | restart)
-GEN_CONF="*SMARTD*AUTOGENERATED*"
-[ ! -f /etc/smartd.conf ] || read DUMMY GEN_CONF DUMMY </etc/smartd.conf \
-&& [ "$GEN_CONF" == "*SMARTD*AUTOGENERATED*" ] \
-&& smartd-conf.py 2>/dev/null >/etc/smartd.conf.new-autogenerated \
-&& mv -f /etc/smartd.conf.new-autogenerated /etc/smartd.conf
+		if [ -x /usr/sbin/smartd-conf.py ]; then
+			GEN_CONF="*SMARTD*AUTOGENERATED*"
+			[ ! -f /etc/smartd.conf ] || read DUMMY GEN_CONF DUMMY </etc/smartd.conf \
+			&& [ "$GEN_CONF" == "*SMARTD*AUTOGENERATED*" ] \
+			&& smartd-conf.py 2>/dev/null >/etc/smartd.conf.new-autogenerated \
+			&& mv -f /etc/smartd.conf.new-autogenerated /etc/smartd.conf
+		fi
     ;;
 esac
 


Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- smartmontools.spec	5 Jun 2007 08:10:33 -0000	1.32
+++ smartmontools.spec	21 Jun 2007 13:26:38 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.37
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -14,7 +14,7 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 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
 Obsoletes:	kernel-utils
 ExclusiveArch:	i386 x86_64 ia64 ppc ppc64
@@ -27,6 +27,15 @@
 utilities will provide advanced warning of disk degradation and
 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
 %setup -q
 %patch1 -p1 -b .cloexec
@@ -49,19 +58,6 @@
 %clean
 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
 if [ "$1" = "0" ] ; then
  /sbin/service smartd stop >/dev/null 2>&1
@@ -76,8 +72,27 @@
 /sbin/chkconfig --add smartd
 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
+* Thu Jun 21 2007 Tomas Smetana <tsmetana at 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 at redhat.com> - 1:5.37-3
 - fix #241385 - smartmontools missing dependency on mailx
 - fix #241388 - unneeded smartd-conf.py[co] installed in /usr/sbin