- use php(core) as dependency to require php version

[packages/dokuwiki-plugin-odt.git] / dokuwiki-plugin-odt.spec

diff --git a/dokuwiki-plugin-odt.spec b/dokuwiki-plugin-odt.spec
index 350091d44f7bc507c3dbc1e0c2f566a8a44e1d25..c6f808c877191673b5a9af51059c59ceb73c47a8 100644 (file)
--- a/dokuwiki-plugin-odt.spec
+++ b/dokuwiki-plugin-odt.spec
@@ -2,17 +2,18 @@
 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
-Release:       1
+Version:       20110616
+Release:       2
 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-%{version}.zip
+Source0:       http://gitorious.org/dokuwiki-odt/dokuwiki-odt/archive-tarball/master#/%{name}-%{version}.tgz
+# Source0-md5: a30fe453e3036014c82e5b5e9a7c47b0
 Patch0:                dokuwiki-ziplib.patch
-URL:           http://wiki.splitbrain.org/plugin:odt
-BuildRequires: unzip
+Patch1:                geshi.patch
+URL:           http://www.dokuwiki.org/plugin:odt
 Requires:      dokuwiki >= 20070626
-Requires:      php-common >= 4:5.0
+Requires:      php(core) >= 5.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,12 +37,15 @@ 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 dokuwiki-odt-dokuwiki-odt/* .
 %patch0 -p1
+%patch1 -p1
+
 version=$( awk '/^date/{print $2}' info.txt)
 if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
        : %%{version} mismatch
-       exit 1
+#      exit 1
 fi
 
 rm -f ZipLib.class.php
@@ -65,12 +69,11 @@ 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
 %{plugindir}/*.png
 %{plugindir}/*.xml
 %{plugindir}/*.php
-%dir %{plugindir}/conf
-%{plugindir}/conf/*.php
+%{plugindir}/conf