From 40f2d5b6851941b199dc6f6317ee31fe6319df07 Mon Sep 17 00:00:00 2001
From: ballen4705 <ballen4705@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Fri, 25 Oct 2002 17:06:17 +0000
Subject: [PATCH] Modified Makefile and spec file to cleanly deal with users
who have uncompressed man pages (these take priority over the compressed
ones)
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@128 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
sm5/CHANGELOG | 6 +++---
sm5/Makefile | 20 +++++++++++++-------
sm5/VERSION | 2 +-
sm5/smartmontools.spec | 27 ++++++++++++++++++---------
4 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index a6b12c71a..372442873 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
CHANGELOG for smartmontools
-$Id: CHANGELOG,v 1.21 2002/10/25 15:13:19 ballen4705 Exp $
+$Id: CHANGELOG,v 1.22 2002/10/25 17:06:17 ballen4705 Exp $
Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
@@ -26,8 +26,8 @@ NOTES FOR NEXT RELEASE:
Next release: handle extended error and self-test logs gracefully.
Parse and print attribute flag meanings
-smartmontools-5.0-14
-
+CURRENT RELEASE (see VERSION file in this directory):
+smartmontools-5.0-VERSION
smartd on startup now looks in the configuration file /etc/smartd.conf for
a list of devices which to include in its monitoring list. See man page
(man smartd) for syntax.
diff --git a/sm5/Makefile b/sm5/Makefile
index 57400cf1a..ada1cf38c 100644
--- a/sm5/Makefile
+++ b/sm5/Makefile
@@ -2,7 +2,7 @@
#
# Home page: http://smartmontools.sourceforge.net
#
-# $Id: Makefile,v 1.22 2002/10/24 09:54:02 ballen4705 Exp $
+# $Id: Makefile,v 1.23 2002/10/25 17:06:17 ballen4705 Exp $
#
# Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
#
@@ -61,22 +61,28 @@ scsiprint.o: scsiprint.h scsiprint.c scsicmds.o smartctl.h extern.h scsicmds.h M
${CC} ${CFLAGS} -c scsiprint.c
clean:
- rm -f *.o smartctl smartd *~ \#*\# smartmontools*.tar.gz smartmontools*.rpm temp.*
+ rm -f *.o smartctl smartd *~ \#*\# smartmontools*.tar.gz smartmontools*.rpm temp.* smart*.8.gz
install: smartctl smartd smartctl.8 smartd.8 smartd.initd Makefile
+ /bin/gzip -c smartctl.8 > smartctl.8.gz
+ /bin/gzip -c smartd.8 > smartd.8.gz
+ rm -f /usr/share/man/man8/smartctl.8
+ rm -f /usr/share/man/man8/smartd.8
install -m 755 -o root -g root -D smartctl $(DESTDIR)/usr/sbin/smartctl
install -m 755 -o root -g root -D smartd $(DESTDIR)/usr/sbin/smartd
- install -m 644 -o root -g root -D smartctl.8 $(DESTDIR)/usr/share/man/man8/smartctl.8
- install -m 644 -o root -g root -D smartd.8 $(DESTDIR)/usr/share/man/man8/smartd.8
+ install -m 644 -o root -g root -D smartctl.8.gz $(DESTDIR)/usr/share/man/man8/smartctl.8.gz
+ install -m 644 -o root -g root -D smartd.8.gz $(DESTDIR)/usr/share/man/man8/smartd.8.gz
install -m 755 -o root -g root -D smartd.initd $(DESTDIR)/etc/rc.d/init.d/smartd
- echo "To manually start smartd on bootup, run /etc/rc.d/init.d/smartd start"
- echo "To Automatically start smartd on bootup, run /sbin/chkconfig --add smartd"
+ @echo -e "\nTo manually start smartd on bootup, run /etc/rc.d/init.d/smartd start"
+ @echo "To Automatically start smartd on bootup, run /sbin/chkconfig --add smartd"
+ @echo "Smartd can now use a configuration file /etc/smartd.conf. Please read man 8 smartd."
+ @echo "Note: you must do a \"make install\" or you won't have the wonderful man pages!"
uninstall: Makefile
rm -f /usr/sbin/smartctl /usr/sbin/smartd /usr/share/man/man8/smartctl.8 /usr/share/man/man8/smartd.8\
/usr/share/man/man8/smartctl.8.gz /usr/share/man/man8/smartd.8.gz
/sbin/chkconfig --del smartd
- /etc/rc.d/init.d/smartd stop
+ if [ -f /var/lock/subsys/smartd ] ; then /etc/rc.d/init.d/smartd stop ; fi
rm -f /etc/rc.d/init.d/smartd
# All this mess is to automatically increment the release numbers.
diff --git a/sm5/VERSION b/sm5/VERSION
index 8351c1939..60d3b2f4a 100644
--- a/sm5/VERSION
+++ b/sm5/VERSION
@@ -1 +1 @@
-14
+15
diff --git a/sm5/smartmontools.spec b/sm5/smartmontools.spec
index 6a01dbf5d..0b3880780 100644
--- a/sm5/smartmontools.spec
+++ b/sm5/smartmontools.spec
@@ -18,7 +18,7 @@ Packager: Bruce Allen <smartmontools-support@lists.sourceforge.net>
# http://telia.dl.sourceforge.net/sourceforge/smartmontools/smartmontools-%{version}-%{release}.tar.gz
# CVS ID of this file is:
-# $Id: smartmontools.spec,v 1.24 2002/10/25 15:13:20 ballen4705 Exp $
+# $Id: smartmontools.spec,v 1.25 2002/10/25 17:06:17 ballen4705 Exp $
# Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
# Home page: http://smartmontools.sourceforge.net
@@ -86,6 +86,12 @@ rm -rf %{_builddir}/%{name}-%{version}
# The following are executed only by the binary RPM at install/uninstall
+# since this installs the gzipped documentation files, remove
+# non-gzipped ones of the same name.
+%pre
+rm -f /usr/share/man/man8/smartctl.8
+rm -f /usr/share/man/man8/smartd.8
+
%post
if [ -f /var/lock/subsys/smartd ]; then
/etc/rc.d/init.d/smartd restart 1>&2
@@ -95,7 +101,7 @@ else
echo "Run \"/sbin/chkconfig --add smartd\", to start smartd service on system boot"
fi
echo "Note that you can now use a configuration file /etc/smartd.conf to control the"
-echo "startup behavior of the smartd daemon. See man smartd for details."
+echo "startup behavior of the smartd daemon. See man 8 smartd for details."
%preun
if [ -f /var/lock/subsys/smartd ]; then
@@ -107,13 +113,16 @@ fi
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* Fri Oct 25 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
-- smartd on startup now looks in the configuration file /etc/smartd.conf for
- a list of devices which to include in its monitoring list. See man page
- (man smartd) for syntax. If not found, try all ata and ide devices.
-- smartd: close file descriptors of SCSI device if not SMART capable
- Closes ALL file descriptors after forking to daemon.
-- added new temperature attribute (231, temperature)
-- smartd: now open ATA disks using O_RDONLY
+- changes to the Makefile and spec file so that if there are ungzipped manual
+ pages in place these will be removed so that the new gzipped man pages are
+ visible.
+- smartd on startup now looks in the configuration file /etc/smartd.conf for
+ a list of devices which to include in its monitoring list. See man page
+ (man smartd) for syntax. If not found, try all ata and ide devices.
+- smartd: close file descriptors of SCSI device if not SMART capable
+ Closes ALL file descriptors after forking to daemon.
+- added new temperature attribute (231, temperature)
+- smartd: now open ATA disks using O_RDONLY
* Thu Oct 24 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- smartd now prints the name of a failed or changed attribute into logfile,
not just ID number
--
GitLab