[smartmontools/f19] smartmontools updated to 6.1

[Michal Hlavinka]

commit e123f6900c16246220e47727cf85eb318994be9c
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Mon Apr 22 13:19:51 2013 +0200

    smartmontools updated to 6.1

 .gitignore                      |    1 +
 smartmontools-5.40-manfix.patch |   21 ---------------------
 smartmontools.spec              |   34 ++++++++++++++++++++++++----------
 sources                         |    2 +-
 4 files changed, 26 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cf3c25b..08aec96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ smartmontools-5.39.1.tar.gz
 /smartmontools-5.42.tar.gz
 /smartmontools-5.43.tar.gz
 /smartmontools-6.0.tar.gz
+/smartmontools-6.1.tar.gz
diff --git a/smartmontools.spec b/smartmontools.spec
index 9c93dba..411a3e4 100644
--- a/smartmontools.spec
+++ b/smartmontools.spec
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
-Version:	6.0
-Release:	2%{?dist}
+Version:	6.1
+Release:	1%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -13,8 +13,6 @@ Source4:        smartdnotify
 #fedora/rhel specific
 Patch1:		smartmontools-5.38-defaultconf.patch
 
-Patch3:         smartmontools-5.40-manfix.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:	fileutils mailx chkconfig
 #new rpm does not handle this (yet?)
@@ -37,10 +35,9 @@ failure.
 %prep
 %setup -q 
 %patch1 -p1 -b .defaultconf
-%patch3 -p1 -b .manfix
 
 # fix encoding
-for fe in AUTHORS CHANGELOG
+for fe in AUTHORS ChangeLog
 do
   iconv -f iso-8859-1 -t utf-8 <$fe >$fe.new
   touch -r $fe $fe.new
@@ -48,9 +45,8 @@ do
 done
 
 %build
-ln -s CHANGELOG ChangeLog
 autoreconf -i
-%configure --with-selinux --with-libcap-ng=yes --with-systemdsystemunitdir=%{_unitdir}
+%configure --with-selinux --with-libcap-ng=yes --with-systemdsystemunitdir=%{_unitdir} --sysconfdir=%{_sysconfdir}/%name/
 %ifarch sparc64
 make CXXFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="-pie -Wl,-z,relro,-z,now"
 %else
@@ -66,6 +62,7 @@ rm -f examplescripts/Makefile*
 chmod a-x -R examplescripts/*
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools
 install -D -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/smartdnotify
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smartd_warning.d
 rm -rf $RPM_BUILD_ROOT/etc/{rc.d,init.d}
 rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
 
@@ -75,6 +72,17 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 %systemd_preun smartd.service
 
+%pre
+if [ $1 = 2 ] # only during update
+then
+  # for Fedora 19-22
+  if [ -f %{_sysconfdir}/smartd.conf -a ! -e %{_sysconfdir}/%name ]
+  then
+    mkdir -p %{_sysconfdir}/%{name}
+    cp -p %{_sysconfdir}/smartd.conf %{_sysconfdir}/%{name}
+  fi
+fi
+
 %post
 %systemd_post smartd.service
 
@@ -83,9 +91,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING INSTALL NEWS README
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
 %doc TODO WARNINGS examplescripts smartd.conf
-%config(noreplace) %{_sysconfdir}/smartd.conf
+%dir %{_sysconfdir}/%name
+%dir %{_sysconfdir}/%name/smartd_warning.d
+%config(noreplace) %{_sysconfdir}/%{name}/smartd.conf
+%config(noreplace) %{_sysconfdir}/%{name}/smartd_warning.sh
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 %{_unitdir}/smartd.service
 %{_sbindir}/smartd
@@ -96,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Wed Mar 20 2013 Michal Hlavinka <mhlavink at redhat.com> - 1:6.1-1
+- smartmontools updated to 6.1
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 0240b3a..4549e89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5646a07f5f4bee8e2e649de8c6b7ae87  smartmontools-6.0.tar.gz
+83a3a681f8183ed858392d550ae1cca6  smartmontools-6.1.tar.gz