diff options
| author | Remi Collet <fedora@famillecollet.com> | 2010-05-24 08:24:57 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2010-05-24 08:24:57 +0200 |
| commit | 67521bc3369f74e14314f7a11e74cc90be0fa02b (patch) | |
| tree | c64e219bbd2374e5fd911c2de3f12b266a09b400 /02_fix_class_mapping.patch | |
| parent | 1cf882aff9f282f79a75d9078a42ff75b640d855 (diff) | |
fix patches + use _datadir + _mandir
Diffstat (limited to '02_fix_class_mapping.patch')
| -rw-r--r-- | 02_fix_class_mapping.patch | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/02_fix_class_mapping.patch b/02_fix_class_mapping.patch index 95b8ea8..875507e 100644 --- a/02_fix_class_mapping.patch +++ b/02_fix_class_mapping.patch @@ -1,7 +1,26 @@ ---- gosa-core~/include/functions.inc 2009-02-16 14:19:18.000000000 +0100 -+++ gosa-core/include/functions.inc 2009-02-16 14:18:15.000000000 +0100 -@@ -73,7 +73,7 @@ - $svn_revision = '$Revision: 13395 $'; +diff -up gosa-combined-2.6.10/include/class_config.inc.02 gosa-combined-2.6.10/include/class_config.inc +--- gosa-combined-2.6.10/include/class_config.inc.02 2010-02-05 14:51:35.000000000 +0100 ++++ gosa-combined-2.6.10/include/class_config.inc 2010-05-24 08:21:41.371435389 +0200 +@@ -100,12 +100,12 @@ class config { + if we have installed or removed plugins. + */ + if(session::global_is_set("class_location.inc:timestamp")){ +- $tmp = stat("../include/class_location.inc"); ++ $tmp = $tmp = stat("/var/cache/gosa/class.cache"); + if($tmp['mtime'] != session::global_get("class_location.inc:timestamp")){ + session::global_un_set("plist"); + } + } +- $tmp = stat("../include/class_location.inc"); ++ $tmp = stat("/var/cache/gosa/class.cache"); + session::global_set("class_location.inc:timestamp",$tmp['mtime']); + + if($this->filename != "" && filemtime($this->filename) != $this->last_modified){ +diff -up gosa-combined-2.6.10/include/functions.inc.02 gosa-combined-2.6.10/include/functions.inc +--- gosa-combined-2.6.10/include/functions.inc.02 2010-05-24 08:21:17.523295153 +0200 ++++ gosa-combined-2.6.10/include/functions.inc 2010-05-24 08:21:41.370670350 +0200 +@@ -73,7 +73,7 @@ $svn_path = '$HeadURL: https://oss.gonic + $svn_revision = '$Revision: 17589 $'; /* Include required files */ -require_once("class_location.inc"); @@ -9,8 +28,9 @@ require_once ("functions_debug.inc"); require_once ("accept-to-gettext.inc"); ---- gosa-core~/update-gosa 2009-02-16 14:19:18.000000000 +0100 -+++ gosa-core/update-gosa 2009-02-16 14:18:15.000000000 +0100 +diff -up gosa-combined-2.6.10/update-gosa.02 gosa-combined-2.6.10/update-gosa +--- gosa-combined-2.6.10/update-gosa.02 2008-06-10 09:56:22.000000000 +0200 ++++ gosa-combined-2.6.10/update-gosa 2010-05-24 08:21:41.370670350 +0200 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -20,7 +40,7 @@ define ("LOCALE_DIR", GOSA_HOME."/locale"); define ("PLUGSTATE_DIR", GOSA_HOME."/state"); -@@ -122,8 +122,8 @@ +@@ -122,8 +122,8 @@ function get_classes($folder= ".") function rescan_classes() { echo "Updating class cache...\n"; @@ -31,20 +51,3 @@ /* Sanity checks */ if (!file_exists($filename) || is_writable($filename)) { ---- gosa-core~/include/class_config.inc 2009-02-16 14:19:18.000000000 +0100 -+++ gosa-core/include/class_config.inc 2009-02-16 14:18:15.000000000 +0100 -@@ -76,12 +76,12 @@ - if we have installed or removed plugins. - */ - if(session::global_is_set("class_location.inc:timestamp")){ -- $tmp = stat("../include/class_location.inc"); -+ $tmp = $tmp = stat("/var/cache/gosa/class.cache"); - if($tmp['mtime'] != session::global_get("class_location.inc:timestamp")){ - session::global_un_set("plist"); - } - } -- $tmp = stat("../include/class_location.inc"); -+ $tmp = stat("/var/cache/gosa/class.cache"); - session::global_set("class_location.inc:timestamp",$tmp['mtime']); - - if($this->filename != "" && filemtime($this->filename) != $this->last_modified){ |