[cacti/el5] Patch $url_path to default to "/cacti/" (upstream bug 2217)

[Ken Dreyer]

commit 77c72073c0a35a255614b108dba336cc3d782a88
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Wed Apr 11 13:15:13 2012 -0600

    Patch $url_path to default to "/cacti/" (upstream bug 2217)

 cacti-0.8.8-default-url-path.patch |   26 ++++++++++++++++++++++++++
 cacti.spec                         |   10 +++++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/cacti-0.8.8-default-url-path.patch b/cacti-0.8.8-default-url-path.patch
new file mode 100644
index 0000000..8ba51f9
--- /dev/null
+++ b/cacti-0.8.8-default-url-path.patch
@@ -0,0 +1,26 @@
+diff --git a/cacti/branches/0.8.8/include/config.php.dist b/cacti/branches/0.8.8/include/config.php.dist
+index fa59eef..20c1929 100644
+--- a/cacti/branches/0.8.8/include/config.php.dist
++++ b/cacti/branches/0.8.8/include/config.php
+@@ -36,7 +36,7 @@ $database_ssl = false;
+    ex: if your cacti install as at http://serverip/cacti/ this
+    would be set to /cacti/
+ */
+-//$url_path = "/";
++//$url_path = "/cacti/";
+ 
+ /* Default session name - Session name must contain alpha characters */
+ //$cacti_session_name = "Cacti";
+diff --git a/cacti/branches/0.8.8/include/global.php b/cacti/branches/0.8.8/include/global.php
+index 4e3bdbb..e41515d 100644
+--- a/cacti/branches/0.8.8/include/global.php
++++ b/cacti/branches/0.8.8/include/global.php
+@@ -43,7 +43,7 @@ $database_ssl = false;
+ $cacti_session_name = "Cacti";
+ 
+ /* define default url path */
+-$url_path = "/";
++$url_path = "/cacti/";
+ 
+ /* Include configuration */
+ include(dirname(__FILE__) . "/config.php");
diff --git a/cacti.spec b/cacti.spec
index f3e9c82..f7ebe97 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,6 +11,7 @@ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+Patch0: cacti-0.8.8-default-url-path.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +34,10 @@ used to creating traffic graphs with MRTG.
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
+# Use "/cacti/" for the default URL, if none is defined.
+# http://bugs.cacti.net/view.php?id=2217
+%patch0 -p4
+
 %install
 rm -rf %{buildroot}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
@@ -114,6 +119,9 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Wed Apr 11 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 0.8.8-3
+- Patch $url_path to default to "/cacti/" (upstream bug 2217)
+
 * Fri Apr 06 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 0.8.8-2
 - Adjust httpd ACL conditionals to test the presence of mod_authz_core
   (as discussed on fedora-devel)