SPECS: cacti.spec - avoid shell interpretation at compile time whe...

[glen]

Author: glen                         Date: Thu Jan 12 22:25:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- avoid shell interpretation at compile time when creating config file

---- Files affected:
SPECS:
   cacti.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/cacti.spec
diff -u SPECS/cacti.spec:1.38 SPECS/cacti.spec:1.39
--- SPECS/cacti.spec:1.38	Thu Jan 12 17:03:38 2006
+++ SPECS/cacti.spec	Thu Jan 12 23:25:14 2006
@@ -75,13 +75,15 @@
 cp -aRf * $RPM_BUILD_ROOT%{webadminroot}
 ln -s . $RPM_BUILD_ROOT%{webadminroot}/%{name}
 
-cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.cfg
+# TODO: move this to SOURCES. it's a lot better to backtrack changes
+# if it's a separate file.
+cat << 'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.cfg
 <?php
-\$database_type = "mysql";
-\$database_default = "cacti";
-\$database_hostname = "localhost";
-\$database_username = "cactiuser";
-\$database_password = "cactiuser";
+$database_type = 'mysql';
+$database_default = 'cacti';
+$database_hostname = 'localhost';
+$database_username = 'cactiuser';
+$database_password = 'cactiuser';
 
 $plugins = array();
 // $plugins[] = 'thold';
@@ -95,7 +97,7 @@
    For example, if your cacti was accessible by http://server/cacti/ you would user '/cacti/'
    as the url path.  For just http://server/ use '/'
 */
-$config["url_path"] = '/cacti/';
+$config['url_path'] = '/cacti/';
 
 ?>
 EOF
@@ -106,7 +108,7 @@
 mv $RPM_BUILD_ROOT%{webadminroot}/rra $RPM_BUILD_ROOT/var/lib/%{name}
 ln -sf /var/lib/%{name}/rra $RPM_BUILD_ROOT%{webadminroot}/rra
 
-cat  << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name}
+cat  << 'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name}
 */5 * * * * http umask 022; /usr/bin/php %{webadminroot}/poller.php > /dev/null 2>&1
 EOF
 
@@ -131,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2006/01/12 22:25:14  glen
+- avoid shell interpretation at compile time when creating config file
+
 Revision 1.38  2006/01/12 16:03:38  wolvverine
 - add plugins architecture
 - please test it
@@ -257,7 +262,7 @@
 
 * Thu Sep 19 2002 Oden Eriksson <oden.eriksson at kvikkjokk.net> 0.6.8a-2mdk
 - misc spec file fixes
-- install in common and relocatable %%{webadminroot}/ directory
+- install in common and relocatable %{webadminroot}/ directory
 
 * Wed Sep 18 2002 Oden Eriksson <oden.eriksson at kvikkjokk.net> 0.6.8a-1mdk
 - security release
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cacti.spec?r1=1.38&r2=1.39&f=u