rpms/horde/devel .cvsignore, 1.2, 1.3 horde.spec, 1.1, 1.2 registry.php, 1.1, 1.2 sources, 1.2, 1.3
Brandon Holbrook (static)
fedora-extras-commits at redhat.com
Thu Mar 15 00:07:14 UTC 2007
- Previous message: rpms/liferea/devel .cvsignore, 1.47, 1.48 liferea.spec, 1.69, 1.70 sources, 1.48, 1.49
- Next message: rpms/horde/FC-6 .cvsignore, 1.2, 1.3 horde.spec, 1.1, 1.2 registry.php, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: static
Update of /cvs/extras/rpms/horde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23849
Modified Files:
.cvsignore horde.spec registry.php sources
Log Message:
Bumped to upstream 3.1.4
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/horde/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 28 Dec 2006 04:34:38 -0000 1.2
+++ .cvsignore 15 Mar 2007 00:06:41 -0000 1.3
@@ -1 +1 @@
-horde-3.1.3.tar.gz
+horde-3.1.4.tar.gz
Index: horde.spec
===================================================================
RCS file: /cvs/extras/rpms/horde/devel/horde.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- horde.spec 28 Dec 2006 04:34:38 -0000 1.1
+++ horde.spec 15 Mar 2007 00:06:41 -0000 1.2
@@ -1,6 +1,6 @@
Name: horde
-Version: 3.1.3
-Release: 11%{?dist}
+Version: 3.1.4
+Release: 1%{?dist}
Summary: The common Horde Framework for all Horde applications
Source0: ftp://ftp.horde.org/pub/horde/tarballs/horde-%{version}.tar.gz
@@ -63,6 +63,8 @@
Most Horde sites will want to configure a database backend for user preferences
and other horde metadata. In order to configure such a backend, be sure you
install the appropriate php database module (such as php-mysql or php-pgsql).
+Then, follow the instructions in %{_datadir}/%{name}/scripts/sql/README to
+import the DB schema.
The following actions are also highly recommended:
- Install 'horde-enhanced' which contains the following packages:
@@ -193,10 +195,6 @@
%post
/sbin/service httpd condrestart > /dev/null 2>&1 || :
-# Not allowed by the beurocracy
-#if [ $1 -eq 1 ]; then
-# echo To configure Horde, please read %{_docdir}/%{name}-%{version}/README.Fedora
-#fi
%postun
/sbin/service httpd condrestart > /dev/null 2>&1 || :
@@ -255,6 +253,10 @@
%doc README.Fedora
%changelog
+* Wed Dec 27 2006 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
+
* Wed Dec 27 2006 Brandon Holbrook <fedora at theholbrooks.org> 3.1.3-11
- created the 'enhanced' subpackage to pull in extented deps
Index: registry.php
===================================================================
RCS file: /cvs/extras/rpms/horde/devel/registry.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- registry.php 28 Dec 2006 04:34:38 -0000 1.1
+++ registry.php 15 Mar 2007 00:06:41 -0000 1.2
@@ -2,7 +2,7 @@
/**
* registry.php -- Horde application registry.
*
- * $Horde: horde/config/registry.php.dist,v 1.255.2.17 2006/07/21 15:49:46 jan Exp $
+ * $Horde: horde/config/registry.php.dist,v 1.255.2.19 2006/11/24 10:48:30 jan Exp $
*
* This configuration file is used by Horde to determine which Horde
* applications are installed and where, as well as how they interact.
@@ -38,33 +38,16 @@
* url string The (optional) URL of 'heading' entries.
*/
-// We try to automatically determine the proper webroot for Horde
-// here. This still assumes that applications live under horde/. If
-// this results in incorrect results for you, simply change the two
-// uses of the $webroot variable in the 'horde' stanza below.
-//
-// Note for Windows users: the below assumes that your PHP_SELF
-// variable uses forward slashes. If it does not, you'll have to tweak
-// this.
-define('FEDORA_FILEROOT', '/usr/share/horde');
+// We try to automatically determine the proper webroot for Horde here. This
+// still assumes that applications live under horde/. If this results in
+// incorrect results for you, simply change the 'webroot' setting in the
+// 'horde' stanza below.
-if (isset($_SERVER['PHP_SELF'])) {
- $webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY);
- $webroot = strstr(dirname(__FILE__), DIRECTORY_SEPARATOR . array_shift($webroot));
- if ($webroot !== false) {
- $webroot = preg_replace(array('/\\\\/', ';/config$;'), array('/', ''), $webroot);
- } elseif ($webroot === false) {
- $webroot = '';
- } else {
- $webroot = '/horde';
- }
-} else {
- $webroot = '/horde';
-}
+define('FEDORA_FILEROOT', '/usr/share/horde');
$this->applications['horde'] = array(
'fileroot' => FEDORA_FILEROOT,
- 'webroot' => $webroot,
+ 'webroot' => _detect_webroot(),
'initial_page' => 'login.php',
'name' => _("Horde"),
'status' => 'active',
@@ -433,7 +416,7 @@
'fileroot' => FEDORA_FILEROOT . '/jeta',
'webroot' => $this->applications['horde']['webroot'] . '/jeta',
'name' => _("SSH"),
- 'status' => 'inactive',
+ 'status' => 'active',
'menu_parent' => 'myaccount'
);
@@ -527,3 +510,30 @@
'status' => 'inactive',
'menu_parent' => 'administration'
);
+
+function _detect_webroot()
+{
+ // Note for Windows users: the below assumes that your PHP_SELF variable
+ // uses forward slashes. If it does not, you'll have to tweak this.
+ if (isset($_SERVER['SCRIPT_URL']) || isset($_SERVER['SCRIPT_NAME'])) {
+ $path = empty($_SERVER['SCRIPT_URL']) ?
+ $_SERVER['SCRIPT_NAME'] :
+ $_SERVER['SCRIPT_URL'];
+ $hordedir = basename(preg_replace(';/config/registry.php$;', '', __FILE__));
+ $webroot = preg_replace(';/' . $hordedir . '.*;', '/' . $hordedir, $path);
+ } elseif (isset($_SERVER['PHP_SELF'])) {
+ $webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY);
+ $webroot = strstr(dirname(__FILE__), DIRECTORY_SEPARATOR . array_shift($webroot));
+ if ($webroot !== false) {
+ $webroot = preg_replace(array('/\\\\/', ';/config$;'), array('/', ''), $webroot);
+ } elseif ($webroot === false) {
+ $webroot = '';
+ } else {
+ $webroot = '/horde';
+ }
+ } else {
+ $webroot = '/horde';
+ }
+
+ return $webroot;
+}
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/horde/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 28 Dec 2006 04:34:38 -0000 1.2
+++ sources 15 Mar 2007 00:06:41 -0000 1.3
@@ -1 +1 @@
-fbc56c608ac81474b846b1b4b7bb5ee7 horde-3.1.3.tar.gz
+90bb96e810f165c2a853175303bd2dbb horde-3.1.4.tar.gz
- Previous message: rpms/liferea/devel .cvsignore, 1.47, 1.48 liferea.spec, 1.69, 1.70 sources, 1.48, 1.49
- Next message: rpms/horde/FC-6 .cvsignore, 1.2, 1.3 horde.spec, 1.1, 1.2 registry.php, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list