summaryrefslogtreecommitdiffstats
path: root/04_fix_online_help_location.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2010-05-24 08:24:57 +0200
committerRemi Collet <fedora@famillecollet.com>2010-05-24 08:24:57 +0200
commit67521bc3369f74e14314f7a11e74cc90be0fa02b (patch)
treec64e219bbd2374e5fd911c2de3f12b266a09b400 /04_fix_online_help_location.patch
parent1cf882aff9f282f79a75d9078a42ff75b640d855 (diff)
fix patches + use _datadir + _mandir
Diffstat (limited to '04_fix_online_help_location.patch')
-rw-r--r--04_fix_online_help_location.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/04_fix_online_help_location.patch b/04_fix_online_help_location.patch
index 85f8ff6..bd98218 100644
--- a/04_fix_online_help_location.patch
+++ b/04_fix_online_help_location.patch
@@ -1,8 +1,8 @@
-diff -urNad gosa-core~/html/helpviewer.php gosa-core/html/helpviewer.php
---- gosa-core~/html/helpviewer.php 2008-04-12 19:58:14.000000000 +0200
-+++ gosa-core/html/helpviewer.php 2008-04-14 17:25:10.000000000 +0200
-@@ -110,7 +110,7 @@
- if(session::is_set('current_class_for_help')){
+diff -up gosa-combined-2.6.10/html/helpviewer.php.04 gosa-combined-2.6.10/html/helpviewer.php
+--- gosa-combined-2.6.10/html/helpviewer.php.04 2010-01-26 09:27:39.000000000 +0100
++++ gosa-combined-2.6.10/html/helpviewer.php 2010-05-24 08:23:40.308670455 +0200
+@@ -104,7 +104,7 @@ $helpdir ="";
+ if(session::global_is_set('current_class_for_help')){
/* Create new XML parser with the path to the Xml file */
- $xml = new parseXml("../doc/guide.xml");
@@ -10,10 +10,10 @@ diff -urNad gosa-core~/html/helpviewer.php gosa-core/html/helpviewer.php
/* Generate help array */
$str = $xml->parse();
-diff -urNad gosa-core~/update-gosa gosa-core/update-gosa
---- gosa-core~/update-gosa 2008-04-14 14:59:22.000000000 +0200
-+++ gosa-core/update-gosa 2008-04-14 17:24:53.000000000 +0200
-@@ -193,7 +193,7 @@
+diff -up gosa-combined-2.6.10/update-gosa.04 gosa-combined-2.6.10/update-gosa
+--- gosa-combined-2.6.10/update-gosa.04 2010-05-24 08:23:14.269545335 +0200
++++ gosa-combined-2.6.10/update-gosa 2010-05-24 08:23:40.308670455 +0200
+@@ -195,7 +195,7 @@ function rescan_i18n()
function rescan_guide()
{