packages: dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec, d...

[glen]

Author: glen                         Date: Mon Jun 11 21:29:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 20120612

---- Files affected:
packages/dokuwiki-plugin-pageredirect:
   dokuwiki-plugin-pageredirect.spec (1.8 -> 1.9) , dokuwiki-find-lang.sh (1.6 -> NONE)  (REMOVED), dokuwiki-plugin-pageredirect-pagematch.patch (1.1 -> NONE)  (REMOVED), mute-warning.patch (1.1 -> NONE)  (REMOVED), preserve-section.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec
diff -u packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec:1.8 packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec:1.9
--- packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec:1.8	Mon Jun  4 14:34:04 2012
+++ packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec	Mon Jun 11 23:29:20 2012
@@ -1,27 +1,28 @@
 # $Revision$, $Date$
-%define		plugin		pageredirect
+%define		plugin	pageredirect
+%define		php_min_version 5.0.0
+%include	/usr/lib/rpm/macros.php
 Summary:	DokuWiki Page Redirect Plugin
 Summary(pl.UTF-8):	Wtyczka Page Redirect (przekierowywania stron) dla DokuWiki
 Name:		dokuwiki-plugin-%{plugin}
-Version:	2
-Release:	3
+Version:	20120612
+Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://wiki.zyberdog.dk/_media/php/dw/pageredirect/pageredirect_current.zip
-# Source0-md5:	ee8fbe1f5686c43441e07e2dc4c82e37
-Source1:	dokuwiki-find-lang.sh
-Patch0:		%{name}-pagematch.patch
-Patch1:		mute-warning.patch
-Patch2:		preserve-section.patch
+Source0:	https://github.com/glensc/dokuwiki-plugin-pageredirect/tarball/master/%{name}-%{version}.tgz
+# Source0-md5:	c65552dc87741be782ae71ddbe7073b9
 URL:		http://www.dokuwiki.org/plugin:page_redirector
-BuildRequires:	unzip
+BuildRequires:	rpmbuild(macros) >= 1.553
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	dokuwiki >= 20061106
 BuildArch:	noarch
+Requires:	php-common >= 4:%{php_min_version}
 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 redirect users between pages and namespaces
@@ -32,10 +33,9 @@
 przestrzeniami nazw poprzez dodawanie określonych oznaczeń na stronie.
 
 %prep
-%setup -q -n %{plugin}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -qc
+# for github urls:
+mv *-%{plugin}-*/* .
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,7 +43,7 @@
 cp -a . $RPM_BUILD_ROOT%{plugindir}
 
 # find locales
-sh %{SOURCE1} %{name}.lang
+%find_lang %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +57,7 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %dir %{plugindir}
+%{plugindir}/*.txt
 %{plugindir}/*.php
 %{plugindir}/*.css
 %{plugindir}/conf
@@ -68,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2012/06/11 21:29:20  glen
+- up to 20120612
+
 Revision 1.8  2012/06/04 12:34:04  glen
 - preserve #section anchors on redirect
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/dokuwiki-plugin-pageredirect/dokuwiki-plugin-pageredirect.spec?r1=1.8&r2=1.9