Author: wolvverine Date: Sun Dec 16 21:19:49 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - add BR, add __php
---- Files affected: SPECS: cacti-addons.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/cacti-addons.spec diff -u SPECS/cacti-addons.spec:1.7 SPECS/cacti-addons.spec:1.8 --- SPECS/cacti-addons.spec:1.7 Sun Dec 16 21:23:53 2007 +++ SPECS/cacti-addons.spec Sun Dec 16 22:19:44 2007 @@ -1,6 +1,6 @@ # $Revision$, $Date$ # TODO - add another -# - patches for path to files +# - patches for path to files (bin,includes) # - %post - add template to cacti %define namesrc cacti_templates %include /usr/lib/rpm/macros.perl @@ -33,6 +33,8 @@ # Source6-md5: d08898b43978ccbd863076c4b3124987 URL: http://www.debianhelp.co.uk/cactitemplates.htm BuildRequires: rpm-perlprov +BuildRequires: rpmbuild(macros) >= 1.322 +%{?requires_php_extension} Requires: cacti BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -42,6 +44,7 @@ %define webcactiscrptserverdir %{webcactiroot}/resource/script_server %define webcactiscriptqueriesdir %{webcactiroot}/resource/script_queries %define webcactisnmpqueriesdir %{webcactiroot}/resource/snmp_queries +%define __php %{_bindir}/php %description Templates and scripts for Cacti. @@ -141,16 +144,16 @@ rm -rf $RPM_BUILD_ROOT %post Cacti_Poller_Statistics -%{webcactiroot}/add_template.php %{webcactiscriptqueriesdir}/cacti_host_template_local_cacti_polling_host.xml +%{__php} %{webcactiroot}/add_template.php %{webcactiscriptqueriesdir}/cacti_host_template_local_cacti_polling_host.xml %post DNS_Server_Response_Time -%{webcactiroot}/add_template.php %{webcactiscriptqueriesdir}/cacti_graph_template_dnsresponsetime.xml +%{__php} %{webcactiroot}/add_template.php %{webcactiscriptqueriesdir}/cacti_graph_template_dnsresponsetime.xml %post Samba_locked_machine -%{webcactiroot}/add_template.php %{webcactiscriptqueriesdir}/cacti_graph_template_snmp_samba.xml +%{__php} %{webcactiroot}/add_template.php %{webcactiscriptqueriesdir}/cacti_graph_template_snmp_samba.xml %post hddtemp -%{webcactiroot}/add_template.php %{webcactiscriptqueriesdir}/cacti_graph_template_linux_hddtemp_disk_temperature*.xml +%{__php} %{webcactiroot}/add_template.php %{webcactiscriptqueriesdir}/cacti_graph_template_linux_hddtemp_disk_temperature*.xml %files Cacti_Poller_Statistics %defattr(644,root,root,755) @@ -184,6 +187,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2007-12-16 21:19:44 wolvverine +- add BR, add __php + Revision 1.7 2007-12-16 20:23:53 wolvverine - correct path ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-addons.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
