rpms/horde/F-8 .cvsignore, 1.3, 1.4 horde.spec, 1.3, 1.4 registry.php, 1.3, 1.4 sources, 1.3, 1.4

[Brandon Holbrook (static)]

Author: static

Update of /cvs/extras/rpms/horde/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24864

Modified Files:
	.cvsignore horde.spec registry.php sources 
Log Message:
Update to 3.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/horde/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Mar 2007 00:06:41 -0000	1.3
+++ .cvsignore	21 Oct 2007 04:11:22 -0000	1.4
@@ -1 +1 @@
-horde-3.1.4.tar.gz
+horde-3.1.5.tar.gz


Index: horde.spec
===================================================================
RCS file: /cvs/extras/rpms/horde/F-8/horde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- horde.spec	20 Mar 2007 05:51:34 -0000	1.3
+++ horde.spec	21 Oct 2007 04:11:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		horde
-Version:	3.1.4
-Release:	2%{?dist}
+Version:	3.1.5
+Release:	1%{?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,9 @@
 %doc README.Fedora
 
 %changelog
+* Sat Oct 20 2007 Brandon Holbrook <fedora at theholbrooks.org> 3.1.5-1
+- Update to 3.1.5
+
 * 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)


Index: registry.php
===================================================================
RCS file: /cvs/extras/rpms/horde/F-8/registry.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- registry.php	20 Mar 2007 05:51:34 -0000	1.3
+++ registry.php	21 Oct 2007 04:11:22 -0000	1.4
@@ -2,7 +2,7 @@
 /**
  * registry.php -- Horde application registry.
  *
- * $Horde: horde/config/registry.php.dist,v 1.255.2.19 2006/11/24 10:48:30 jan Exp $
+ * $Horde: horde/config/registry.php.dist,v 1.255.2.20 2007/03/29 23:02:48 jan Exp $
  *
  * This configuration file is used by Horde to determine which Horde
  * applications are installed and where, as well as how they interact.
@@ -520,7 +520,8 @@
         $path = empty($_SERVER['SCRIPT_URL']) ?
             $_SERVER['SCRIPT_NAME'] :
             $_SERVER['SCRIPT_URL'];
-        $hordedir = basename(preg_replace(';/config/registry.php$;', '', __FILE__));
+        $hordedir = str_replace(DIRECTORY_SEPARATOR, '/', __FILE__);
+        $hordedir = basename(preg_replace(';/config/registry.php$;', '', $hordedir));
         $webroot = preg_replace(';/' . $hordedir . '.*;', '/' . $hordedir, $path);
     } elseif (isset($_SERVER['PHP_SELF'])) {
         $webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY);


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/horde/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Mar 2007 00:06:41 -0000	1.3
+++ sources	21 Oct 2007 04:11:22 -0000	1.4
@@ -1 +1 @@
-90bb96e810f165c2a853175303bd2dbb  horde-3.1.4.tar.gz
+48fa10539954c57a4fdf42e011ad4f5c  horde-3.1.5.tar.gz