SPECS: netmrg.spec - updated to 050727 snap - repaired spec file l...

luzik luzik at pld-linux.org
Wed Jul 27 10:58:08 CEST 2005


Author: luzik                        Date: Wed Jul 27 08:58:08 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 050727 snap
- repaired spec file log
- moved webfiles to datadir
- added crond restart
- doesn't build with rrdtool >= 1.2 (rrdtool issue)

---- Files affected:
SPECS:
   netmrg.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/netmrg.spec
diff -u SPECS/netmrg.spec:1.7 SPECS/netmrg.spec:1.8
--- SPECS/netmrg.spec:1.7	Tue Nov 23 14:03:38 2004
+++ SPECS/netmrg.spec	Wed Jul 27 10:58:03 2005
@@ -1,13 +1,15 @@
 # $Revision$, $Date$
+%define		snap	050727
 Summary:	Network Monitoring package using PHP, MySQL, and RRDtool
 Summary(pl):	Monitor sieci używający PHP, MySQL i RRDtool
 Name:		netmrg
 Version:	0.18.2
-Release:	1
+Release:	1.%{snap}.1
 License:	MIT
 Group:		Applications/Networking
-Source0:	http://www.netmrg.net/download/release/%{name}-%{version}.tar.gz
-# Source0-md5:	fc0f13c0a73d0f98fcd42608257f225a
+#Source0:	http://www.netmrg.net/download/release/%{name}-%{version}.tar.gz
+Source0:	http://mieszkancy.ds.pg.gda.pl/~luzik/%{name}-%{snap}.tar.gz
+# Source0-md5:	e4baf3664aad402d6116fd3863a7d856
 Source1:	%{name}-httpd.conf
 Source2:	%{name}-cron
 Patch0:		%{name}-config.patch
@@ -25,7 +27,7 @@
 %define		_pkglibdir		/var/lib/%{name}
 %define		_wwwuser		http
 %define		_wwwgroup		http
-%define		_wwwrootdir		/home/services/httpd
+%define		_wwwrootdir		%{_datadir}/%{name}/webfiles
 
 %description
 NetMRG is a tool for network monitoring, reporting, and graphing.
@@ -39,7 +41,7 @@
 wykresy przedstawiające dowolne parametry sieci.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
 
 %build
@@ -71,6 +73,9 @@
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
 fi
+if [ -f /var/lock/subsys/crond ]; then
+	/etc/rc.d/init.d/crond restart 1>&2
+fi
 echo "Before first run read /usr/share/doc/%{name}-%{version}/INSTALL how to put
 /usr/share/netmrg/db/netmrg.mysql in your mysql server"
 
@@ -96,27 +101,9 @@
 %attr(640,root,root) %{_sysconfdir}/cron.d/netmrg
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/netmrg.xml
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/%{name}.conf
-%attr(755,root,root) %{_bindir}/netmrg_cron.sh
 %attr(755,root,root) %{_bindir}/netmrg-gatherer
 %attr(755,root,root) %{_bindir}/rrdedit
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/db
-%dir %{_datadir}/%{name}/images
-%{_datadir}/%{name}/*/*
-%dir %{_wwwrootdir}/netmrg
-%dir %{_wwwrootdir}/netmrg/include
-%dir %{_wwwrootdir}/netmrg/lib
-%dir %{_wwwrootdir}/netmrg/webfiles
-%dir %{_wwwrootdir}/netmrg/webfiles/images
-%dir %{_wwwrootdir}/netmrg/webfiles/images/default
-%dir %{_wwwrootdir}/netmrg/webfiles/include
-%dir %{_wwwrootdir}/netmrg/webfiles/img
-%{_wwwrootdir}/netmrg/include/config.php
-%{_wwwrootdir}/netmrg/*/*.php
-%{_wwwrootdir}/netmrg/*/*.ico
-%{_wwwrootdir}/netmrg/webfiles/images/default/*
-%{_wwwrootdir}/netmrg/webfiles/img/*
-%{_wwwrootdir}/netmrg/webfiles/include/netmrg.css
+%{_datadir}/%{name}
 %dir %{_pkglibdir}
 %attr(700,http,http) %dir %{_pkglibdir}/rrd
 %attr(700,http,http) %{_pkglibdir}/rrd/*
@@ -132,12 +119,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/07/27 08:58:03  luzik
+- updated to 050727 snap
+- repaired spec file log
+- moved webfiles to datadir
+- added crond restart
+- doesn't build with rrdtool >= 1.2 (rrdtool issue)
+
 Revision 1.7  2004/11/23 13:03:38  luzik
- - updated to 0.18.2
- - rel. 1
+- updated to 0.18.2
+- rel. 1
 
 Revision 1.6  2004/06/30 15:11:43  luzik
- - updated to 0.16
+- updated to 0.16
 
 Revision 1.5  2004/02/18 08:29:17  blues
 - small fixes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/netmrg.spec?r1=1.7&r2=1.8&f=u




More information about the pld-cvs-commit mailing list