rpms/mon/F-10 mon.spec,1.1,1.2

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/mon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8412/F-10

Modified Files:
	mon.spec 
Log Message:
* Fri Feb 20 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.2.0-3
- Remove AOL::TOC
- Add most of shipped monitors (GDC #581)



Index: mon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mon/F-10/mon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mon.spec	19 Feb 2009 08:31:36 -0000	1.1
+++ mon.spec	20 Feb 2009 14:55:00 -0000	1.2
@@ -1,9 +1,12 @@
+# TODO: Split monitors and alerts into subpackages
+#       they drag in way too much dependencies
+
 %define moncgi_version 1.52
 
 Name:           mon
 Summary:        General-purpose resource monitoring system
 Version:        1.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://www.kernel.org/software/mon/
@@ -80,13 +83,11 @@
         $RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/   \
         $RPM_BUILD_ROOT%{_localstatedir}/lib/mon/{log.d,state.d}/
 
-make install -C mon.d \
-        MONPATH="$RPM_BUILD_ROOT%{_libdir}/mon"
-
 install -p -m0755 mon clients/moncmd clients/monshow clients/skymon/skymon $RPM_BUILD_ROOT%{_bindir}
 install -p -m0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 install -p -m0644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
+install -p -m0755 mon.d/*.wrap mon.d/*.monitor $RPM_BUILD_ROOT%{_libdir}/mon/mon.d/
 install -p -m0755 alert.d/* $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/
 install -p -m0755 alerts/*/*.alert $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/
 
@@ -139,13 +140,33 @@
 %{_localstatedir}/www/cgi-bin/mon.cgi
 %{_bindir}/*
 %{_localstatedir}/lib/mon/
-%{_libdir}/mon/
-
+%dir %{_libdir}/mon
+%{_libdir}/mon/alert.d
+%dir %{_libdir}/mon/mon.d
+%{_libdir}/mon/mon.d/*.monitor
 %attr(2755, root, uucp) %{_libdir}/mon/mon.d/dialin.monitor.wrap
 
+# These packages are not in EPEL
+%if 0%{?rhel} <= 5
+# perl(Expect)
+%exclude %{_libdir}/mon/mon.d/dialin.monitor
+# perl(Authen::Radius)
+%exclude %{_libdir}/mon/mon.d/radius.monitor
+%endif
+
+# These are not in Fedora either
+# perl(AOL::TOC)
+%exclude %{_libdir}/mon/alert.d/aim.alert
+# perl(Filesys::DiskSpace)
+%exclude %{_libdir}/mon/mon.d/freespace.monitor
+
 
 %changelog
-* Sun Jul 13 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.2.0-2
+* Fri Feb 20 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.2.0-3
+- Remove AOL::TOC
+- Add most of shipped monitors (GDC #581)
+
+* Sun Jul 13 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.2.0-2
 - Refactor a bit, to fit Fedora customs and guidelines
 - Fix use of optflags
 - Fix file encodings