rpms/horde/FC-6 horde.spec,1.2,1.3 registry.php,1.2,1.3

[Brandon Holbrook (static)]

Author: static

Update of /cvs/extras/rpms/horde/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6804/FC-6

Modified Files:
	horde.spec registry.php 
Log Message:
Disable horde's new webroot autodetection



Index: horde.spec
===================================================================
RCS file: /cvs/extras/rpms/horde/FC-6/horde.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- horde.spec	15 Mar 2007 00:10:38 -0000	1.2
+++ horde.spec	21 Mar 2007 02:33:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		horde
 Version:	3.1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The common Horde Framework for all Horde applications
 
 Source0:	ftp://ftp.horde.org/pub/horde/tarballs/horde-%{version}.tar.gz
@@ -253,6 +253,10 @@
 %doc README.Fedora
 
 %changelog
+* Mon Mar 19 2007 Brandon Holbrook <fedora at theholbrooks.org> 3.1.4-2
+- Fix webroot to '/horde' in registry.php
+	(Horde's webroot auto-detection doesn't work with our config files under /etc)
+
 * Wed Mar 14 2007 Brandon Holbrook <fedora at theholbrooks.org> 3.1.4-1
 - Bumped to upstream 3.1.4
 - Made jeta 'active' in registry.php since it is no longer beta


Index: registry.php
===================================================================
RCS file: /cvs/extras/rpms/horde/FC-6/registry.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- registry.php	15 Mar 2007 00:10:38 -0000	1.2
+++ registry.php	21 Mar 2007 02:33:30 -0000	1.3
@@ -44,10 +44,11 @@
 // 'horde' stanza below.
 
 define('FEDORA_FILEROOT', '/usr/share/horde');
+define('FEDORA_WEBROOT', '/horde');
 
 $this->applications['horde'] = array(
     'fileroot' => FEDORA_FILEROOT,
-    'webroot' => _detect_webroot(),
+    'webroot' => FEDORA_WEBROOT,
     'initial_page' => 'login.php',
     'name' => _("Horde"),
     'status' => 'active',