rpms/sysusage/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sysusage.spec, 1.4, 1.5 sysusage-2.9.cfg, 1.1, NONE

Tue Jun 2 10:00:24 UTC 2009

Author: rmyers

Update of /cvs/pkgs/rpms/sysusage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2515

Modified Files:
	.cvsignore sources sysusage.spec 
Removed Files:
	sysusage-2.9.cfg 
Log Message:
update to sysusage 2.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sysusage/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- .cvsignore	16 Oct 2008 01:51:13 -0000	1.3
+++ .cvsignore	2 Jun 2009 09:59:53 -0000	1.4
@@ -1 +1,2 @@
 SysUsage-Sar-2.9.tar.gz
+SysUsage-Sar-2.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sysusage/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Oct 2008 01:37:13 -0000	1.3
+++ sources	2 Jun 2009 09:59:53 -0000	1.4
@@ -1 +1 @@
-5b1fac7a503a3c7f390220aeab3ae948  SysUsage-Sar-2.9.tar.gz
+0364e1f599552ed945bfa800709fb0d4  SysUsage-Sar-2.10.tar.gz


Index: sysusage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysusage/devel/sysusage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sysusage.spec	26 Feb 2009 05:27:35 -0000	1.4
+++ sysusage.spec	2 Jun 2009 09:59:53 -0000	1.5
@@ -5,15 +5,14 @@
 
 Name: %{wname}
 Epoch: 0
-Version: 2.9
-Release: 2%{?dist}
+Version: 2.10
+Release: 1%{?dist}
 Summary: System monitoring based on perl, rrdtool, and sysstat
 
 Group: System Environment/Daemons
 License: GPL+ or Artistic
-URL: http://www.samse.fr/GPL/%{wname}
-Source0: http://www.samse.fr/GPL/%{wname}/%{uname}-%{vname}-%{version}.tar.gz
-Source1: %{wname}-%{version}.cfg
+URL: http://sysusage.sourceforge.net
+Source0: http://downloads.sourceforge.net/%{name}/%{uname}-%{vname}-%{version}.tar.gz
 BuildArch: noarch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -21,52 +20,66 @@ Requires: rrdtool
 Requires: sysstat
 Requires: httpd
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: vixie-cron
 
 %description
-SysUsage is a tool used to continuously monitor a system and generate a
-daily/weekly/monthly/yearly graphical report using rrdtool and sar.
+%{uname} is a system monitoring and alarm reporting tool. 
+It can generate historical graph views of CPU, memory, IO,
+network and disk usage, and very much more.
 
 %prep
 %setup -q -n %{uname}-%{vname}-%{version}
 
 # create default crontab entry
-echo "#*/1 * * * *    root    %{_bindir}/%{wname} > /dev/null 2>&1" > %{wname}.cron
-echo "#*/5 * * * *    root    %{_bindir}/%{wname}graph > /dev/null 2>&1" >> %{wname}.cron
+%{__cat} > %{wname}.cron << _EOF1_
+#* * * * *    root    %{_bindir}/%{wname}      >/dev/null 2>&1
+#*/5 * * * *    root    %{_bindir}/%{wname}graph >/dev/null 2>&1
+_EOF1_
 
 # create default httpd configuration
-cat > %{wname}.conf << _EOF_
+%{__cat} > %{wname}.conf << _EOF2_
 #
 # By default %{wname} statistics are only accessible from the local host.
 # 
-Alias /%{wname} %{webdir}
+#Alias /%{wname} %{webdir}
 
-<Directory %{webdir}>
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1
-    Allow from ::1
-    # Allow from .example.com
-</Directory>
-_EOF_
+#<Directory %{webdir}>
+    #Order deny,allow
+    #Deny from all
+    #Allow from 127.0.0.1
+    #Allow from ::1
+    ## Allow from .example.com
+#</Directory>
+_EOF2_
 
-# create README.Fedora
-cat > README.Fedora << _EOF_
+# create README.RPM
+%{__cat} > README.RPM << _EOF3_
 1. Setup a cronjob to run %{wname}.  Uncomment the entries in
    %{_sysconfdir}/cron.d/%{wname} or create a custom cronjob.
 
-2. Ensure that httpd is running.
+2. Uncomment the entries in %{_sysconfdir}/httpd/conf.d/%{wname}.conf.
 
-3. Browse to http://localhost/%{wname} to ensure that things are working
+3. Ensure that httpd is running.
+
+4. Browse to http://localhost/%{wname} to ensure that things are working
    properly.
 
-4. If necessary, give additional hosts access to %{wname} by adding them to
+5. If necessary, give additional hosts access to %{wname} by adding them to
    %{_sysconfdir}/httpd/conf.d/%{wname}.conf.
-_EOF_
+
+_EOF3_
 
 # remove the hardcoded /usr/local/sysusage path
 %{__sed} -i -e 's,/usr/local/sysusage,,g' bin/%{wname}
 %{__sed} -i -e 's,/usr/local/sysusage,,g' bin/%{wname}graph
 
+# hopefully this one will get fixed in the next release
+%{__sed} -i -e 's,bin/hostname,/bin/hostname,g' %{wname}-%{version}.cfg
+
+# this is needed because of the resolution to RH bug #465652
+%{__sed} -i -e 's,/var/www/html/%{name},/var/www/%{wname},g' \
+    %{wname}-%{version}.cfg
+
 %build
 # nope, gotta love perl
 
@@ -79,20 +92,23 @@ _EOF_
 %{__install} -d -m 0755 %{buildroot}/%{perl_vendorlib}/%{uname}
 %{__install} -d -m 0755 %{buildroot}/%{webdir}
 # install files
-%{__install} -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{wname}.cfg
+%{__install} -m 0644 %{name}-%{version}.cfg \
+    %{buildroot}/%{_sysconfdir}/%{wname}.cfg
 %{__install} -m 0644 %{vname}.pm %{buildroot}/%{perl_vendorlib}/%{uname}
 %{__install} -m 0755 bin/%{wname} %{buildroot}/%{_bindir}
 %{__install} -m 0755 bin/%{wname}graph %{buildroot}/%{_bindir}
 %{__install} -m 0755 bin/%{wname}warn %{buildroot}/%{_bindir}
-%{__install} -D -m 0644 %{wname}.cron %{buildroot}/%{_sysconfdir}/cron.d/%{wname}
-%{__install} -D -m 0644 %{wname}.conf %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{wname}.conf
+%{__install} -D -m 0644 %{wname}.cron \
+    %{buildroot}/%{_sysconfdir}/cron.d/%{wname}
+%{__install} -D -m 0644 %{wname}.conf \
+    %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{wname}.conf
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(0644,root,root,0755)
-%doc Changes INSTALL README TODO README.Fedora
+%doc Changes INSTALL README TODO README.RPM
 %attr(0755,root,root) %{_bindir}/%{wname}
 %attr(0755,root,root) %{_bindir}/%{wname}graph
 %attr(0755,root,root) %{_bindir}/%{wname}warn
@@ -104,6 +120,17 @@ _EOF_
 %dir %{webdir}
 
 %changelog
+* Tue Jun  2 2009 Rob Myers <rmyers at fedoraproject.org> 0:2.10-1
+- include many fixes from Jason Corley (Thanks!)
+- update to 2.10
+- update url to reflect upstream change to sourcefourge
+- add requirement on vixie-cron
+- remove source1 in favor of now included in tarball config file
+- change to installing apache config commented out
+- change description to most recent website blurb
+- change README.Fedora to README.RPM (for EPEL)
+- fix cronjob
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- sysusage-2.9.cfg DELETED ---


