SPECS: dokuwiki.spec - really use properly system geshi

[glen]

Author: glen                         Date: Thu Nov 29 10:14:58 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- really use properly system geshi

---- Files affected:
SPECS:
   dokuwiki.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/dokuwiki.spec
diff -u SPECS/dokuwiki.spec:1.15 SPECS/dokuwiki.spec:1.16
--- SPECS/dokuwiki.spec:1.15	Tue Nov 20 00:51:20 2007
+++ SPECS/dokuwiki.spec	Thu Nov 29 11:14:53 2007
@@ -3,7 +3,7 @@
 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
@@ -14,6 +14,7 @@
 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
@@ -71,15 +72,13 @@
 %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
@@ -210,6 +209,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007-11-29 10:14:53  glen
+- really use properly system geshi
+
 Revision 1.15  2007-11-19 23:51:20  glen
 - add -config-allow-require.patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki.spec?r1=1.15&r2=1.16&f=u