rpms/smartmontools/devel smartd.initd, 1.6, 1.7 smartmontools.spec, 1.46, 1.47 smartd-conf.py, 1.13, NONE smartmontools-5.36-cciss.patch, 1.1, NONE smartmontools-5.36-cloexec.patch, 1.1, NONE smartmontools-5.36-sata.patch, 1.1, NONE smartmontools-5.36.tar.gz.asc, 1.1, NONE smartmontools-5.37-3ware.patch, 1.1, NONE smartmontools-5.37-buildfix.patch, 1.2, NONE smartmontools-5.37-cloexec.patch, 1.1, NONE

Tomas Smetana (tsmetana) fedora-extras-commits at redhat.com
Mon May 12 10:18:34 UTC 2008


Author: tsmetana

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

Modified Files:
	smartd.initd smartmontools.spec 
Removed Files:
	smartd-conf.py smartmontools-5.36-cciss.patch 
	smartmontools-5.36-cloexec.patch smartmontools-5.36-sata.patch 
	smartmontools-5.36.tar.gz.asc smartmontools-5.37-3ware.patch 
	smartmontools-5.37-buildfix.patch 
	smartmontools-5.37-cloexec.patch 
Log Message:
* Mon May 12 2008 Tomas Smetana <tsmetana at redhat.com> - 1:5.38-5
- remove config subpackage



Index: smartd.initd
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartd.initd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- smartd.initd	4 Sep 2007 11:59:22 -0000	1.6
+++ smartd.initd	12 May 2008 10:17:58 -0000	1.7
@@ -47,17 +47,6 @@
 prog=smartd
 pidfile=/var/lock/subsys/smartd
 
-genconfig()
-{
-	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
-}
-
 start()
 {
 	echo -n $"Starting $prog: "
@@ -98,14 +87,12 @@
 
 case "$1" in
 	start)
-		genconfig
 		start
 		;;
 	stop)
 		stop
 		;;
 	reload)
-		genconfig
 		reload
 		;;
 	report)
@@ -113,18 +100,15 @@
 		;;
 	restart)
 		stop
-		genconfig
 		start
 		;;
 	try-restart)
 		if [ -f $pidfile ]; then
 			stop
-			genconfig
 			start
 		fi
 		;;
 	force-reload)
-		genconfig
 		reload || (stop; start)
 		;;
 	status)
@@ -135,6 +119,6 @@
 		echo $"Usage: $0 {start|stop|reload|force-reload|report|restart|try-restart|status}"
 		RETVAL=3
 esac
-    
+
 exit $RETVAL
 


Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- smartmontools.spec	5 May 2008 10:11:17 -0000	1.46
+++ smartmontools.spec	12 May 2008 10:17:58 -0000	1.47
@@ -1,15 +1,14 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	4.1%{?dist}
+Release: 	5%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
 URL:		http://smartmontools.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:	smartd.initd
-Source2:	smartd-conf.py
-Source3:	smartmontools.sysconf
+Source2:	smartmontools.sysconf
 Patch1:		smartmontools-5.38-cloexec.patch
 Patch2:     smartmontools-5.37-addrinfo.patch
 Patch3:     smartmontools-5.38-perc.patch
@@ -27,19 +26,10 @@
 The smartmontools package contains two utility programs (smartctl
 and smartd) to control and monitor storage systems using the Self-
 Monitoring, Analysis and Reporting Technology System (SMART) built
-into most modern ATA and SCSI hard disks. In many cases, these 
+into most modern ATA and SCSI hard disks. In many cases, these
 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
@@ -59,21 +49,7 @@
 #rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd.conf
 rm -f examplescripts/Makefile*
 install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd
-install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/smartd-conf.py
-touch $RPM_BUILD_ROOT%{_sbindir}/smartd-conf.py{c,o}
-install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools
-
-%define cfgfile $RPM_BUILD_ROOT%{_sysconfdir}/smartd.conf
-echo "# *SMARTD*AUTOGENERATED* /etc/smartd.conf" > %{cfgfile}.head
-echo \
-"# The line above is relevant only if you have smartmontools-config	installed:" \
-	>> %{cfgfile}.head
-echo "# Remove the line if you have edited the file and you do not want" \
-	>> %{cfgfile}.head
-echo "# it to be overwritten on the next smartd startup." >> %{cfgfile}.head
-echo "" >> %{cfgfile}.head
-cat %{cfgfile}.head smartd.conf > %{cfgfile}
-rm -f %{cfgfile}.head
+install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -104,12 +80,10 @@
 %config(noreplace) %{_sysconfdir}/smartd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
-%files config
-%defattr(-,root,root)
-%{_sbindir}/smartd-conf.py
-%exclude %{_sbindir}/smartd-conf.py[co]
-
 %changelog
+* Mon May 12 2008 Tomas Smetana <tsmetana at redhat.com> - 1:5.38-5
+- remove config subpackage
+
 * Mon May 05 2008 Tomas Smetana <tsmetana at redhat.com> - 1:5.38-4.1
 - add libselinux-devel to BR
 


--- smartd-conf.py DELETED ---


--- smartmontools-5.36-cciss.patch DELETED ---


--- smartmontools-5.36-cloexec.patch DELETED ---


--- smartmontools-5.36-sata.patch DELETED ---


--- smartmontools-5.36.tar.gz.asc DELETED ---


--- smartmontools-5.37-3ware.patch DELETED ---


--- smartmontools-5.37-buildfix.patch DELETED ---


--- smartmontools-5.37-cloexec.patch DELETED ---




More information about the fedora-extras-commits mailing list