- update to 20090702

Changed files:
    dokuwiki-find-lang.sh -> 1.7
    dokuwiki-plugin-odt.spec -> 1.8

diff --git a/dokuwiki-find-lang.sh b/dokuwiki-find-lang.sh
deleted file mode 100644 (file)
index db54c83..0000000
--- a/dokuwiki-find-lang.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-PROG=${0##*/}
-dir=$RPM_BUILD_ROOT/usr/share/dokuwiki
-langfile=$1
-tmp=$(mktemp) || exit 1
-rc=0
-
-find $dir -type d -name lang > $tmp
-
-echo '%defattr(644,root,root,755)' > $langfile
-while read dir; do
-       echo "%dir ${dir#$RPM_BUILD_ROOT}" >> $langfile
-       for dir in $dir/*; do
-               lang=${dir##*/}
-               dir=${dir#$RPM_BUILD_ROOT}
-               case "$lang" in
-               zh-tw)
-                       lang=zh_TW
-               ;;
-               pt-br)
-                       lang=pt_BR
-               ;;
-               sl-si)
-                       lang=sl
-               ;;
-               id-ni)
-                       lang=id_NI
-               ;;
-               ca-va)
-                       lang=ca_VA
-               ;;
-               *-*)
-                       echo >&2 "ERROR: Need mapping for $lang!"
-                       rc=1
-               ;;
-               esac
-               echo "%lang($lang) ${dir#$RPM_BUILD_ROOT}" >> $langfile
-       done
-done < $tmp
-
-if [ "$(egrep -v '(^%defattr|^$)' $langfile | wc -l)" -le 0 ]; then
-       echo >&2 "$PROG: Error: international files not found!"
-       rc=1
-fi
-
-rm -f $tmp
-exit $rc

diff --git a/dokuwiki-plugin-odt.spec b/dokuwiki-plugin-odt.spec
index 6a110ae045a3f310847b9120dff120df70f1606e..94dc001585534a03c14942774db952135c7ceadc 100644 (file)
--- a/dokuwiki-plugin-odt.spec
+++ b/dokuwiki-plugin-odt.spec
@@ -2,21 +2,23 @@
 Summary:       DokuWiki odt (Open Document Text) Export Plugin
 Summary(pl-UTF8):      Wtyczka do eksportowania plików odt (Open Document Text)
 Name:          dokuwiki-plugin-%{plugin}
-Version:       20090115
+Version:       20090702
 Release:       1
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://gauret.free.fr/fichiers/dokuwiki/dokuwiki-odt-%{version}.tgz
-# Source0-md5: 278748da7659129ae9806b9726961e53
-Source1:       dokuwiki-find-lang.sh
+Source0:       http://gauret.free.fr/fichiers/dokuwiki/dokuwiki-odt-%{version}.zip
+# Source0-md5: 41c47719f7a118a0ffbc1428c841bb56
 URL:           http://wiki.splitbrain.org/plugin:odt
+Patch0:                dokuwiki-ziplib.patch
 Requires:      dokuwiki >= 20070626
+Requires:      php-common >= 4:5.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                dokuconf        /etc/webapps/dokuwiki
 %define                dokudir         /usr/share/dokuwiki
 %define                plugindir       %{dokudir}/lib/plugins/%{plugin}
+%define                find_lang       %{_usrlibrpm}/dokuwiki-find-lang.sh %{buildroot}
 
 %description
 This plugin allows you to export a page to the OpenDocument format
@@ -27,22 +29,29 @@ Hint: Open Office can also export to PDF.
 
 %description -l pl-UTF8
 Ta wtyczka pozwala na eksportowanie strony do formatu OpenDocument,
-używanego przez Open Office i inne edytory tekstu. Przydatna jest
-w sytuacji w której musisz dać pojedyńczą stronę klientowi.
+używanego przez Open Office i inne edytory tekstu. Przydatna jest w
+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}
+%patch0 -p1
+version=$( awk '/^date/{print $2}' info.txt)
+if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
+       : %%{version} mismatch
+       exit 1
+fi
+
+rm -f ZipLib.class.php
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{plugindir}
-cp -a . $RPM_BUILD_ROOT%{plugindir}
+cp -a conf lang *.php *.png *.xml info.txt $RPM_BUILD_ROOT%{plugindir}
 rm -f $RPM_BUILD_ROOT%{plugindir}/{ChangeLog,.gitignore}
 
-# find locales
-sh %{SOURCE1} %{name}.lang
+%find_lang %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,7 +63,8 @@ if [ -f %{dokuconf}/local.php ]; then
 fi
 
 %files -f %{name}.lang
-%doc ChangeLog
+%defattr(644,root,root,755)
+%doc ChangeLog README.txt TODO.txt
 %defattr(644,root,root,755)
 %dir %{plugindir}
 %{plugindir}/*.txt