SPECS: dokuwiki.spec - use system geshi

[glen]

Author: glen                         Date: Fri Nov  9 16:55:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use system geshi

---- Files affected:
SPECS:
   dokuwiki.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/dokuwiki.spec
diff -u SPECS/dokuwiki.spec:1.10 SPECS/dokuwiki.spec:1.11
--- SPECS/dokuwiki.spec:1.10	Mon Aug 20 01:23:42 2007
+++ SPECS/dokuwiki.spec	Fri Nov  9 17:55:00 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	20070626b
-Release:	0.16
+Release:	0.21
 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
 URL:		http://wiki.splitbrain.org/wiki:dokuwiki
 BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	geshi >= 1.0.7.19
 Requires:	webapps
 Requires:	webserver(alias)
 Requires:	webserver(php) >= 4.0.6
@@ -25,6 +26,7 @@
 %define		_sysconfdir	%{_webapps}/%{_webapp}
 %define		_appdir		%{_datadir}/%{_webapp}
 %define		_localstatedir	/var/lib/%{name}
+%define		_phpdir	/usr/share/php
 
 %description
 DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
@@ -67,6 +69,13 @@
 # safe file
 mv conf/words.aspell{.dist,}
 
+# use system geshi package
+cat <<'EOF' > inc/geshi.php
+<?php
+require_once '%{_phpdir}/geshi.php';
+EOF
+rm -rf inc/geshi
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_localstatedir},%{_appdir}/{bin,inc,lib}}
@@ -195,7 +204,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.10  2007-08-19 23:23:42  glen
+Revision 1.11  2007-11-09 16:55:00  glen
+- use system geshi
+
+Revision 1.10  2007/08/19 23:23:42  glen
 - plain %config at least
 
 Revision 1.9  2007/08/19 17:46:13  glen
================================================================

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