packages: dokuwiki-plugin-include/dokuwiki-plugin-include.spec, dokuwiki-pl...

[glen]

Author: glen                         Date: Wed Sep 29 07:17:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 20091127

---- Files affected:
packages/dokuwiki-plugin-include:
   dokuwiki-plugin-include.spec (1.10 -> 1.11) , dokuwiki-find-lang.sh (1.6 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-include/dokuwiki-plugin-include.spec
diff -u packages/dokuwiki-plugin-include/dokuwiki-plugin-include.spec:1.10 packages/dokuwiki-plugin-include/dokuwiki-plugin-include.spec:1.11
--- packages/dokuwiki-plugin-include/dokuwiki-plugin-include.spec:1.10	Thu Feb 12 10:59:06 2009
+++ packages/dokuwiki-plugin-include/dokuwiki-plugin-include.spec	Wed Sep 29 09:16:56 2010
@@ -3,21 +3,23 @@
 Summary:	DokuWiki Include Plugin
 Summary(pl.UTF-8):	Wtyczka Include (dołączania) dla DokuWiki
 Name:		dokuwiki-plugin-%{plugin}
-Version:	20080707
+Version:	20091127
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://www.chimeric.de/_src/plugin-include.tgz
-# Source0-md5:	61763a3e5fa742e3fd73938054d98b4a
-Source1:	dokuwiki-find-lang.sh
-URL:		http://www.dokuwiki.org/plugin:include
+Source0:	http://cloud.github.com/downloads/dokufreaks/plugin-include/plugin-include.tgz
+# Source0-md5:	984e895d951f00842e35cb8e24fef1e1
+URL:		http://www.wikidesign.ch/en/plugin/include/start
+BuildRequires:	rpmbuild(macros) >= 1.520
 Requires:	dokuwiki >= 20080505
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		dokuconf	/etc/webapps/dokuwiki
 %define		dokudir		/usr/share/dokuwiki
+%define		dokudata	/var/lib/dokuwiki
 %define		plugindir	%{dokudir}/lib/plugins/%{plugin}
+%define		find_lang 	%{_usrlibrpm}/dokuwiki-find-lang.sh %{buildroot}
 
 %description
 This is a very simple yet handy plugin with which you can include
@@ -28,7 +30,14 @@
 dołączyć inną stronę wiki do bieżącej.
 
 %prep
-%setup -q -n %{plugin}
+%setup -qc
+mv %{plugin}/* .
+
+version=$(cat VERSION)
+if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
+	: %%{version} mismatch
+	exit 1
+fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -37,23 +46,29 @@
 rm -f $RPM_BUILD_ROOT%{plugindir}/{COPYING,README,VERSION}
 
 # find locales
-sh %{SOURCE1} %{name}.lang
+%find_lang %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# force css cache refresh
+# force js cache refresh
 if [ -f %{dokuconf}/local.php ]; then
 	touch %{dokuconf}/local.php
 fi
 
+# http://www.dokuwiki.org/plugin:include says:
+# It is recommended to delete all cache files in <dokuwiki>/data/cache directly after upgrading the plugin
+# seems doku cache is one letter hex subdirs. nuke those
+rm -rf %{dokudata}/cache/?
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README
 %dir %{plugindir}
 %{plugindir}/*.php
 %{plugindir}/*.css
+%{plugindir}/*.js
 %{plugindir}/conf
 %{plugindir}/images
 %{plugindir}/syntax
@@ -64,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/09/29 07:16:56  glen
+- up to 20091127
+
 Revision 1.10  2009/02/12 09:59:06  glen
 - update url
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-plugin-include/dokuwiki-plugin-include.spec?r1=1.10&r2=1.11&f=u