rpms/smartmontools/devel smartmontools.spec,1.39,1.40

Tomas Smetana (tsmetana) fedora-extras-commits at redhat.com
Wed Dec 12 14:16:54 UTC 2007


Author: tsmetana

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

Modified Files:
	smartmontools.spec 
Log Message:
* Wed Dec 12 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-8.3
- fix #375791 - parameter warning for smartd in logwatch output



Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- smartmontools.spec	31 Oct 2007 11:47:40 -0000	1.39
+++ smartmontools.spec	12 Dec 2007 14:16:19 -0000	1.40
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.37
-Release: 	8.2%{?dist}
+Release: 	8.3%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -55,13 +55,25 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd.conf
+#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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,7 +99,8 @@
 %{_sbindir}/smartctl
 %{_sysconfdir}/rc.d/init.d/smartd
 %{_mandir}/man?/smart*.*
-%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/smartd.conf
+# %ghost %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/smartd.conf
+%config(noreplace) %{_sysconfdir}/smartd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %files config
@@ -96,6 +109,9 @@
 %exclude %{_sbindir}/smartd-conf.py[co]
 
 %changelog
+* Wed Dec 12 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-8.3
+- fix #375791 - parameter warning for smartd in logwatch output
+
 * Wed Oct 31 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-8.2
 - rebuild (one more error in autogen.sh)
 




More information about the fedora-extras-commits mailing list