packages: dokuwiki-plugin-odt/dokuwiki-plugin-odt.spec, dokuwiki-plugin-odt...

[glen]

Author: glen                         Date: Wed Sep 15 14:03:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 20100812

---- Files affected:
packages/dokuwiki-plugin-odt:
   dokuwiki-plugin-odt.spec (1.10 -> 1.11) , geshi.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-odt/dokuwiki-plugin-odt.spec
diff -u packages/dokuwiki-plugin-odt/dokuwiki-plugin-odt.spec:1.10 packages/dokuwiki-plugin-odt/dokuwiki-plugin-odt.spec:1.11
--- packages/dokuwiki-plugin-odt/dokuwiki-plugin-odt.spec:1.10	Sun May 16 16:13:45 2010
+++ packages/dokuwiki-plugin-odt/dokuwiki-plugin-odt.spec	Wed Sep 15 16:03:49 2010
@@ -3,13 +3,14 @@
 Summary:	DokuWiki odt (Open Document Text) Export Plugin
 Summary(pl.UTF-8):	Wtyczka do eksportowania plików odt (Open Document Text)
 Name:		dokuwiki-plugin-%{plugin}
-Version:	20100404
+Version:	20100812
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://gauret.free.fr/fichiers/dokuwiki/dokuwiki-odt-%{version}.zip
-# Source0-md5:	ffee0778f67a50d4bcf838e2054f7341
+Source0:	http://aurelien.bompard.org/projects/files/dokuwiki-odt/dokuwiki-odt-20100812.zip
+# Source0-md5:	28839a411068e2c923c74734e35481ff
 Patch0:		dokuwiki-ziplib.patch
+Patch1:		geshi.patch
 URL:		http://wiki.splitbrain.org/plugin:odt
 BuildRequires:	unzip
 Requires:	dokuwiki >= 20070626
@@ -37,8 +38,12 @@
 Podpowiedź: Open Office pozwala także na eksportowanie do PDF.
 
 %prep
-%setup -q -n %{plugin}
+%setup -qc
+mv %{plugin}/* .
+
 %patch0 -p1
+%patch1 -p1
+
 version=$( awk '/^date/{print $2}' info.txt)
 if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
 	: %%{version} mismatch
@@ -66,7 +71,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc ChangeLog.txt README.txt TODO.txt
+%doc ChangeLog.txt README.txt
 %defattr(644,root,root,755)
 %dir %{plugindir}
 %{plugindir}/*.txt
@@ -82,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/09/15 14:03:49  glen
+- up to 20100812
+
 Revision 1.10  2010/05/16 14:13:45  sparky
 - BR: unzip
 

================================================================
Index: packages/dokuwiki-plugin-odt/geshi.patch
diff -u /dev/null packages/dokuwiki-plugin-odt/geshi.patch:1.1
--- /dev/null	Wed Sep 15 16:03:58 2010
+++ packages/dokuwiki-plugin-odt/geshi.patch	Wed Sep 15 16:03:49 2010
@@ -0,0 +1,13 @@
+--- dokuwiki-plugin-odt-20100812/renderer.php~	2010-09-15 12:18:41.000000000 +0300
++++ dokuwiki-plugin-odt-20100812/renderer.php	2010-09-15 12:21:24.009399926 +0300
+@@ -892,8 +892,8 @@
+         }
+ 
+         // from inc/parserutils.php:p_xhtml_cached_geshi()
+-        require_once(DOKU_INC . 'inc/geshi.php');
+-        $geshi = new GeSHi($text, $language, DOKU_INC . 'inc/geshi');
++        require_once '/usr/share/php/geshi.php';
++        $geshi = new GeSHi($text, $language);
+         $geshi->set_encoding('utf-8');
+         // $geshi->enable_classes(); DO NOT WANT !
+         $geshi->set_header_type(GESHI_HEADER_PRE);
================================================================

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