From 120fd5b37012c3cc5f71ce2bd7c230e02d69310f Mon Sep 17 00:00:00 2001
From: ballen4705 <ballen4705@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Fri, 9 May 2003 19:20:23 +0000
Subject: [PATCH] Fixed smartmontools.spec and smartd.initd so that they should
work correctly with Redhat 6.x. Thanks to Gerald Schnabel.
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@740 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
sm5/CHANGELOG | 7 ++++++-
sm5/VERSION | 2 +-
sm5/smartd.initd | 4 ++--
sm5/smartmontools.spec | 9 ++++++++-
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index ac99db7a7..d88ec2d72 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
CHANGELOG for smartmontools
-$Id: CHANGELOG,v 1.142 2003/05/07 14:48:17 ballen4705 Exp $
+$Id: CHANGELOG,v 1.143 2003/05/09 19:20:23 ballen4705 Exp $
Copyright (C) 2002-3 Bruce Allen <smartmontools-support@lists.sourceforge.net>
@@ -37,6 +37,11 @@ CURRENT DEVELOPMENT VERSION (see VERSION file in this directory):
<ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED HERE, PLEASE>
+
+ [BA] Modified smartmontools.spec [Man pages location] and
+ smartd.initd [Extra space kills chkconfig!] for Redhat 6.x
+ compatibility (thanks to Gerald Schnabel).
+
smartmontools-5.1-11
[EB] Add another Fujitsu disk to knowndrives.c
diff --git a/sm5/VERSION b/sm5/VERSION
index b4de39476..48082f72f 100644
--- a/sm5/VERSION
+++ b/sm5/VERSION
@@ -1 +1 @@
-11
+12
diff --git a/sm5/smartd.initd b/sm5/smartd.initd
index 973a98cfb..87c0bbafe 100755
--- a/sm5/smartd.initd
+++ b/sm5/smartd.initd
@@ -1,12 +1,12 @@
#!/bin/bash
-# chkconfig: 35 40 40
+# chkconfig: 35 40 40
# smartmontools init file for smartd
#
# description: Self Monitoring and Reporting Technology (SMART) Daemon
#
# processname: smartd
#
-# $Id: smartd.initd,v 1.5 2003/03/06 07:27:18 ballen4705 Exp $
+# $Id: smartd.initd,v 1.6 2003/05/09 19:20:23 ballen4705 Exp $
#
# Copyright (C) 2002-3 Bruce Allen <smartmontools-support@lists.sourceforge.net>
#
diff --git a/sm5/smartmontools.spec b/sm5/smartmontools.spec
index 3b40da2b9..bba458efa 100644
--- a/sm5/smartmontools.spec
+++ b/sm5/smartmontools.spec
@@ -30,7 +30,7 @@ Packager: Bruce Allen <smartmontools-support@lists.sourceforge.net>
# http://ftp1.sourceforge.net/smartmontools/smartmontools-%{version}-%{release}.tar.gz
# CVS ID of this file is:
-# $Id: smartmontools.spec,v 1.98 2003/05/07 14:29:19 ballen4705 Exp $
+# $Id: smartmontools.spec,v 1.99 2003/05/09 19:20:23 ballen4705 Exp $
# Copyright (C) 2002-3 Bruce Allen <smartmontools-support@lists.sourceforge.net>
# Home page: http://smartmontools.sourceforge.net/
@@ -204,6 +204,13 @@ make
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
+# Red Hat 6.x: move manuals (man directory) from %datadir to %prefix
+if [ -f /etc/redhat-release ]; then
+ if `cat /etc/redhat-release | grep >/dev/null 2>&1 "release 6."`; then
+ mv -f $RPM_BUILD_ROOT%{_datadir}/man $RPM_BUILD_ROOT%{_prefix}
+ fi
+fi
+
%files
%defattr(-,root,root)
%attr(755,root,root) %{_sbindir}/smartd
--
GitLab