Author: glen                         Date: Sun Oct  5 04:00:40 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- scripts now executable

---- Files affected:
SPECS:
   cacti.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: SPECS/cacti.spec
diff -u SPECS/cacti.spec:1.83 SPECS/cacti.spec:1.84
--- SPECS/cacti.spec:1.83       Sun Oct  5 05:28:54 2008
+++ SPECS/cacti.spec    Sun Oct  5 06:00:34 2008
@@ -1,12 +1,10 @@
 # $Revision$, $Date$
-# TODO
-# - shouldn't files in scripts dir be executable?
 %include       /usr/lib/rpm/macros.perl
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
 Version:       0.8.7b
-Release:       9.18
+Release:       9.21
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
@@ -25,6 +23,7 @@
 Patch6:                %{name}-ioerror.patch
 URL:           http://www.cacti.net/
 BuildRequires: rpm-perlprov
+BuildRequires: sed >= 4.0
 Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
@@ -110,6 +109,10 @@
 rm -rf lib/adodb
 rm -f log/.htaccess
 rm -f rra/.placeholder
+rm -f plugins/index.php
+
+%{__sed} -i -e '1i#!%{_bindir}/php' scripts/*.php
+chmod a+rx scripts/*
 
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -184,9 +187,20 @@
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/config.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
/etc/cron.d/%{name}
 %attr(755,root,root) %{_sbindir}/cacti-poller
-%{_appdir}
+%dir %{_appdir}
 %exclude %{_appdir}/install
 %exclude %{_appdir}/docs
+%{_appdir}/resource
+%{_appdir}/sql
+%{_appdir}/lib
+%{_appdir}/include
+%{_appdir}/images
+%{_appdir}/cli
+%{_appdir}/plugins
+%{_appdir}/*.php
+
+%dir %{_appdir}/scripts
+%attr(755,root,root) %{_appdir}/scripts/*
 
 %attr(750,root,http) %dir /var/lib/%{name}
 %attr(770,root,http) %dir /var/lib/%{name}/rra
@@ -207,6 +221,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2008/10/05 04:00:34  glen
+- scripts now executable
+
 Revision 1.83  2008/10/05 03:28:54  glen
 - ioerror patch; renum patches
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti.spec?r1=1.83&r2=1.84&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to