- up to 20090912

Changed files:
    dokuwiki-find-lang.sh -> 1.7
    dokuwiki-plugin-blog.spec -> 1.6

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-blog.spec b/dokuwiki-plugin-blog.spec
index 7a3b5563d3aa7e60ad63d463965e33b3dc73be65..66174c71a262b137c1cce413ac794003876ba0b3 100644 (file)
--- a/dokuwiki-plugin-blog.spec
+++ b/dokuwiki-plugin-blog.spec
@@ -1,14 +1,14 @@
 %define                plugin          blog
 Summary:       DokuWiki Blog Plugin
 Name:          dokuwiki-plugin-%{plugin}
-Version:       20080718
-Release:       1
+Version:       20090912
+Release:       0.1
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://www.chimeric.de/_src/plugin-blog.tgz
-# Source0-md5: 772b602ffaf2270c1d8611e8a5243e3c
-Source1:       dokuwiki-find-lang.sh
+Source0:       http://cloud.github.com/downloads/dokufreaks/plugin-blog/plugin-blog.tgz
+# Source0-md5: d722e48067ffccc6786b9ad25e9dcb4e
 URL:           http://www.dokuwiki.org/plugin:blog
+BuildRequires: rpmbuild(macros) >= 1.520
 Requires:      dokuwiki >= 20080505
 Requires:      dokuwiki-plugin-include
 Requires:      dokuwiki-plugin-pagelist
@@ -18,28 +18,31 @@ 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 makes blogs in your wiki easily possible.
+The Blog Plugin makes blogs in your wiki easily possible. The blog
+component shows the latest entries (pages) from a namespace in reverse
+chronological order.
 
 %prep
-%setup -q -n %{plugin}
+%setup -qc
+mv %{plugin}/* .
+
 version=$(cat VERSION)
 if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
        : %%{version} mismatch
        exit 1
 fi
 
-rm -f blog.tar.gz
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{plugindir}
 cp -a . $RPM_BUILD_ROOT%{plugindir}
-rm -rf $RPM_BUILD_ROOT%{plugindir}/{COPYING,README,VERSION,_template.txt}
+rm $RPM_BUILD_ROOT%{plugindir}/{COPYING,README,VERSION,_template.txt}
 
 # find locales
-sh %{SOURCE1} %{name}.lang
+%find_lang %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT