From 149aff42ae64472c0dc25d8c2564b7f7b8a1333e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 11 Jun 2012 21:29:20 +0000 Subject: [PATCH] - up to 20120612 Changed files: dokuwiki-find-lang.sh -> 1.7 dokuwiki-plugin-pageredirect-pagematch.patch -> 1.2 dokuwiki-plugin-pageredirect.spec -> 1.9 mute-warning.patch -> 1.2 preserve-section.patch -> 1.2 --- dokuwiki-find-lang.sh | 47 -------------------- dokuwiki-plugin-pageredirect-pagematch.patch | 11 ----- dokuwiki-plugin-pageredirect.spec | 31 ++++++------- mute-warning.patch | 13 ------ preserve-section.patch | 22 --------- 5 files changed, 16 insertions(+), 108 deletions(-) delete mode 100644 dokuwiki-find-lang.sh delete mode 100644 dokuwiki-plugin-pageredirect-pagematch.patch delete mode 100644 mute-warning.patch delete mode 100644 preserve-section.patch 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 diff --git a/dokuwiki-plugin-pageredirect-pagematch.patch b/dokuwiki-plugin-pageredirect-pagematch.patch deleted file mode 100644 index f66b458..0000000 --- a/dokuwiki-plugin-pageredirect-pagematch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pageredirect/syntax.php~ 2007-01-24 12:36:50.000000000 +0200 -+++ pageredirect/syntax.php 2008-01-25 11:36:14.597898649 +0200 -@@ -36,7 +36,7 @@ - function getSort() { return 1; } - - function connectTo($mode) { -- $this->Lexer->addSpecialPattern('~~REDIRECT>[a-zA-Z0-9_\-:]+~~', $mode, 'plugin_pageredirect'); -+ $this->Lexer->addSpecialPattern('~~REDIRECT>.+~~', $mode, 'plugin_pageredirect'); - } - - /** diff --git a/dokuwiki-plugin-pageredirect.spec b/dokuwiki-plugin-pageredirect.spec index 3bc2f25..e8a6001 100644 --- a/dokuwiki-plugin-pageredirect.spec +++ b/dokuwiki-plugin-pageredirect.spec @@ -1,26 +1,27 @@ -%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 @@ -31,10 +32,9 @@ Ta wtyczka pozwala przekierowywać użytkowników między stronami i 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 @@ -42,7 +42,7 @@ install -d $RPM_BUILD_ROOT%{plugindir} cp -a . $RPM_BUILD_ROOT%{plugindir} # find locales -sh %{SOURCE1} %{name}.lang +%find_lang %{name}.lang %clean rm -rf $RPM_BUILD_ROOT @@ -56,6 +56,7 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) %dir %{plugindir} +%{plugindir}/*.txt %{plugindir}/*.php %{plugindir}/*.css %{plugindir}/conf diff --git a/mute-warning.patch b/mute-warning.patch deleted file mode 100644 index 812a1df..0000000 --- a/mute-warning.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- pageredirect/action.php~ 2007-01-24 14:36:36.000000000 +0200 -+++ pageredirect/action.php 2010-08-24 17:30:13.450389203 +0300 -@@ -91,7 +91,9 @@ - } - - function handle_pageredirect_metadata(&$event, $param) { -- unset($event->data->meta['relation']['isreplacedby']); -+ if (isset($event->data->meta['relation'])) { -+ unset($event->data->meta['relation']['isreplacedby']); -+ } - } - - } diff --git a/preserve-section.patch b/preserve-section.patch deleted file mode 100644 index 9668a50..0000000 --- a/preserve-section.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- pageredirect/action.php 2012-06-04 15:32:26.364418325 +0300 -+++ pageredirect/action.php 2012-06-04 15:32:49.548728621 +0300 -@@ -63,9 +63,17 @@ - session_start(); - $_SESSION[DOKU_COOKIE]['redirect'] = $ID; - } -- -+ -+ // preserve #section from $page -+ list($page, $section) = explode('#', $page, 2); -+ if (isset($section)) { -+ $section = '#' . $section; -+ } else { -+ $section = ''; -+ } -+ - // redirect -- header("Location: ".wl($page, Array('redirect' => $redirect), TRUE, '&')); -+ header("Location: ".wl($page, Array('redirect' => $redirect), TRUE, '&'). $section); - exit(); - } - } -- 2.43.0