- really use properly system geshi

Changed files:
    dokuwiki-geshi.patch -> 1.1
    dokuwiki.spec -> 1.16

diff --git a/dokuwiki-geshi.patch b/dokuwiki-geshi.patch
new file mode 100644 (file)
index 0000000..8bb41c1
--- /dev/null
+++ b/dokuwiki-geshi.patch
@@ -0,0 +1,22 @@
+--- dokuwiki-2007-06-26b/inc/parserutils.php   2007-06-26 21:27:15.000000000 +0300
++++ dokuwiki/inc/parserutils.php       2007-11-29 11:47:57.797811307 +0200
+@@ -585,16 +585,16 @@
+   $cache = getCacheName($language.$code,".code");
+ 
+   if (@file_exists($cache) && !$_REQUEST['purge'] &&
+-     (filemtime($cache) > filemtime(DOKU_INC . 'inc/geshi.php'))) {
++     (filemtime($cache) > filemtime('/usr/share/php/geshi.php'))) {
+ 
+     $highlighted_code = io_readFile($cache, false);
+     @touch($cache);
+ 
+   } else {
+ 
+-    require_once(DOKU_INC . 'inc/geshi.php');
++    require_once '/usr/share/php/geshi.php';
+ 
+-    $geshi = new GeSHi($code, strtolower($language), DOKU_INC . 'inc/geshi');
++    $geshi = new GeSHi($code, strtolower($language));
+     $geshi->set_encoding('utf-8');
+     $geshi->enable_classes();
+     $geshi->set_header_type(GESHI_HEADER_PRE);

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 2acdb17a54ead94b398419adacececb169948ebb..fe7038399136162bd4e56a328300c84b035793ef 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -2,7 +2,7 @@ Summary:        PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       20070626b
-Release:       0.23
+Release:       0.25
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-2007-06-26b.tgz
@@ -13,6 +13,7 @@ Patch0:               %{name}-paths.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-mysqlauth.patch
 Patch3:                %{name}-config-allow-require.patch
+Patch4:                %{name}-geshi.patch
 URL:           http://wiki.splitbrain.org/wiki:dokuwiki
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      geshi >= 1.0.7.19
@@ -70,15 +71,13 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # safe file
 mv conf/words.aspell{.dist,}
 
 # use system geshi package
-cat <<'EOF' > inc/geshi.php
-<?php
-require_once '%{_phpdir}/geshi.php';
-EOF
+rm -f inc/geshi.php
 rm -rf inc/geshi
 
 %install