[packages/dokuwiki-plugin-tag] up to 20120328

glen glen at pld-linux.org
Thu Aug 16 20:34:56 CEST 2012


commit 4486118a95db075d86e766a5d0a46dabf736c934
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 16 21:34:50 2012 +0300

    up to 20120328

 dokuwiki-find-lang.sh    | 47 -----------------------------------------------
 dokuwiki-plugin-tag.spec | 29 ++++++++++++++++-------------
 2 files changed, 16 insertions(+), 60 deletions(-)
---
diff --git a/dokuwiki-plugin-tag.spec b/dokuwiki-plugin-tag.spec
index a47e4a2..60461e2 100644
--- a/dokuwiki-plugin-tag.spec
+++ b/dokuwiki-plugin-tag.spec
@@ -1,13 +1,12 @@
 %define		plugin		tag
 Summary:	DokuWiki Tag Plugin
 Name:		dokuwiki-plugin-%{plugin}
-Version:	20080707
+Version:	20120328
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://www.chimeric.de/_src/plugin-tag.tgz
-# Source0-md5:	6f9bc7915fc273a161c093ce525f0abc
-Source1:	dokuwiki-find-lang.sh
+Source0:	http://github.com/dokufreaks/plugin-tag/tarball/master/%{name}-%{version}.tgz
+# Source0-md5:	ddfb8d16b315e61ca68e5b6daa7d305d
 URL:		http://www.dokuwiki.org/plugin:tag
 Requires:	dokuwiki >= 20070626
 BuildArch:	noarch
@@ -16,6 +15,7 @@ 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
 The Tag Plugin lets you assign category tags to wiki pages. It will
@@ -23,20 +23,22 @@ display a list of links to the tag pages in the tag namespace
 specified in the configuration.
 
 %prep
-%setup -q -n %{plugin}
-if [ $(cat VERSION | tr -d -) != %{version} ]; then
-	: %%{version} mismatch, should be: $(cat VERSION | tr -d -)
-	exit 1
+%setup -qc
+mv *-%{plugin}-*/* .
+
+version=$(awk '/^date/{print $2}' plugin.info.txt)
+if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
+	: %%{version} mismatch
+#	exit 1
 fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{plugindir}
 cp -a . $RPM_BUILD_ROOT%{plugindir}
-rm -f $RPM_BUILD_ROOT%{plugindir}/{COPYING,README,VERSION}
+rm -f $RPM_BUILD_ROOT%{plugindir}/{COPYING,README}
 
-# find locales
-sh %{SOURCE1} %{name}.lang
+%find_lang %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,11 +51,12 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README VERSION
+%doc README
 %dir %{plugindir}
-%{plugindir}/*.php
 %{plugindir}/*.css
 %{plugindir}/*.js
+%{plugindir}/*.php
+%{plugindir}/*.txt
 %{plugindir}/conf
 %{plugindir}/images
 %{plugindir}/syntax
diff --git a/dokuwiki-find-lang.sh b/dokuwiki-find-lang.sh
deleted file mode 100644
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


More information about the pld-cvs-commit mailing list