- up to 20100812

Changed files:
    dokuwiki-plugin-odt.spec -> 1.11
    geshi.patch -> 1.1

diff --git a/dokuwiki-plugin-odt.spec b/dokuwiki-plugin-odt.spec
index 350091d44f7bc507c3dbc1e0c2f566a8a44e1d25..b610733431edd9345f86f563bda64f30feaeaea1 100644 (file)
--- a/dokuwiki-plugin-odt.spec
+++ b/dokuwiki-plugin-odt.spec
@@ -2,13 +2,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
@@ -36,8 +37,12 @@ sytuacji w której musisz dać pojedyńczą stronę klientowi.
 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
@@ -65,7 +70,7 @@ fi
 
 %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

diff --git a/geshi.patch b/geshi.patch
new file mode 100644 (file)
index 0000000..0c8171d
--- /dev/null
+++ b/geshi.patch
@@ -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);