commit 11ff22de28426bfbf5c84221b169a574754d23b5
Author: Elan Ruusamäe <[email protected]>
Date: Sat Dec 22 16:29:33 2018 +0200
up to 2017-11-05
confdir.patch | 31 -------------------------------
dokuwiki-plugin-redirect.spec | 6 ++----
2 files changed, 2 insertions(+), 35 deletions(-)
---
diff --git a/dokuwiki-plugin-redirect.spec b/dokuwiki-plugin-redirect.spec
index 7c8b295..892c993 100644
--- a/dokuwiki-plugin-redirect.spec
+++ b/dokuwiki-plugin-redirect.spec
@@ -1,4 +1,4 @@
-%define subver 2017-03-08
+%define subver 2017-11-05
%define ver %(echo %{subver} | tr -d -)
%define plugin redirect
%define php_min_version 5.3.0
@@ -10,8 +10,7 @@ Release: 1
License: GPL v2
Group: Applications/WWW
Source0:
https://github.com/splitbrain/dokuwiki-plugin-redirect/archive/%{subver}/%{plugin}-%{subver}.tar.gz
-# Source0-md5: 99a8d76dc828f9f0b6bf4b91d7bb0ab2
-Patch0: confdir.patch
+# Source0-md5: 9a75af351d1d2352d7903c57a3c2f82e
URL: https://www.dokuwiki.org/plugin:redirect
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.520
@@ -33,7 +32,6 @@ central configuration file.
%prep
%setup -qc
mv *-%{plugin}-*/* .
-%patch0 -p1
%build
version=$(awk '/^date/{print $2}' plugin.info.txt)
diff --git a/confdir.patch b/confdir.patch
deleted file mode 100644
index f75dcd0..0000000
--- a/confdir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- dokuwiki-plugin-redirect-20100613/action.php 2011-02-06
20:26:05.000000000 +0200
-+++ dokuwiki-plugin-redirect-20100613/action.php 2012-05-30
16:28:11.153277934 +0300
-@@ -34,7 +34,7 @@
-
- if($ACT != 'show') return;
-
-- $redirects = confToHash(dirname(__FILE__).'/redirect.conf');
-+ $redirects = confToHash(DOKU_CONF.'/redirect.conf');
- if($redirects[$ID]){
- if(preg_match('/^https?:\/\//',$redirects[$ID])){
- send_redirect($redirects[$ID]);
---- dokuwiki-plugin-redirect-20120918/admin.php~ 2012-09-18
21:46:55.000000000 +0300
-+++ dokuwiki-plugin-redirect-20120918/admin.php 2012-09-18
21:47:33.419278055 +0300
-@@ -37,7 +37,7 @@
- */
- function handle() {
- if($_POST['redirdata']){
--
if(io_saveFile(dirname(__FILE__).'/redirect.conf',cleanText($_POST['redirdata']))){
-+
if(io_saveFile(DOKU_CONF.'/redirect.conf',cleanText($_POST['redirdata']))){
- msg($this->getLang('saved'),1);
- }
- }
-@@ -53,7 +53,7 @@
- echo '<input type="hidden" name="do" value="admin" />';
- echo '<input type="hidden" name="page" value="redirect" />';
- echo '<textarea class="edit" rows="15" cols="80" style="height:
300px" name="redirdata">';
-- echo formtext(io_readFile(dirname(__FILE__).'/redirect.conf'));
-+ echo formtext(io_readFile(DOKU_CONF.'/redirect.conf'));
- echo '</textarea><br />';
- echo '<input type="submit" value="'.$lang['btn_save'].'"
class="button" />';
- echo '</form>';
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-redirect.git/commitdiff/11ff22de28426bfbf5c84221b169a574754d23b5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
