rpms/mon/devel mon.spec,1.4,1.5

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/mon/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5230

Modified Files:
	mon.spec 
Log Message:
* Wed Apr 21 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 1.2.0-6
- Add missing dependencies (#584281)
- Fix path to libdir for 64-bits



Index: mon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mon/devel/mon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mon.spec	25 Jul 2009 14:57:53 -0000	1.4
+++ mon.spec	21 Apr 2010 11:29:54 -0000	1.5
@@ -1,12 +1,13 @@
 # TODO: Split monitors and alerts into subpackages
 #       they drag in way too much dependencies
 
-%define moncgi_version 1.52
+%global moncgi_version 1.52
+%global fixlib sed 's,/usr/lib,%{_libdir},g'
 
 Name:           mon
 Summary:        General-purpose resource monitoring system
 Version:        1.2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://www.kernel.org/software/mon/
@@ -22,6 +23,11 @@ Source5:        userfile
 Patch0:         mon-1.2.0-perl.patch
 Patch1:         mon-1.2.0-uucp.patch
 
+Requires:       perl(Authen::PAM)
+Requires:       iputils
+Requires:       fping
+Requires:       traceroute
+
 BuildRequires:  dos2unix
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -91,8 +97,9 @@ install -p -m0755 mon.d/*.wrap mon.d/*.m
 install -p -m0755 alert.d/* $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/
 install -p -m0755 alerts/*/*.alert $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/
 
-install -Dp -m0644 etc/auth.cf $RPM_BUILD_ROOT%{_sysconfdir}/mon/auth.cf
-install -Dp -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mon/mon.cf
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/mon
+%{fixlib} etc/auth.cf >$RPM_BUILD_ROOT%{_sysconfdir}/mon/auth.cf
+%{fixlib} %{SOURCE3} >$RPM_BUILD_ROOT%{_sysconfdir}/mon/mon.cf
 install -Dp -m0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/mon
 install -Dp -m0600 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/mon/userfile
 
@@ -107,6 +114,9 @@ chmod -x mon.cgi-1.52/mon.cgi           
         clients/batch-example                   \
         utils/syslog.monitor
 
+# Fix library path in examples
+%{fixlib} -i etc/*.cf
+
 
 
 %clean
@@ -162,6 +172,10 @@ fi
 
 
 %changelog
+* Wed Apr 21 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 1.2.0-6
+- Add missing dependencies (#584281)
+- Fix path to libdir for 64-bits
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild