packages: dokuwiki-plugin-redirect/dokuwiki-plugin-redirect.spec, dokuwiki-...

[glen]

Author: glen                         Date: Wed May 30 13:32:51 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- put config to confdir

---- Files affected:
packages/dokuwiki-plugin-redirect:
   dokuwiki-plugin-redirect.spec (1.2 -> 1.3) , confdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-redirect/dokuwiki-plugin-redirect.spec
diff -u packages/dokuwiki-plugin-redirect/dokuwiki-plugin-redirect.spec:1.2 packages/dokuwiki-plugin-redirect/dokuwiki-plugin-redirect.spec:1.3
--- packages/dokuwiki-plugin-redirect/dokuwiki-plugin-redirect.spec:1.2	Wed May 30 15:23:32 2012
+++ packages/dokuwiki-plugin-redirect/dokuwiki-plugin-redirect.spec	Wed May 30 15:32:46 2012
@@ -10,6 +10,7 @@
 Group:		Applications/WWW
 Source0:	http://github.com/splitbrain/dokuwiki-plugin-%{plugin}/tarball/master#/%{plugin}-%{version}.tgz
 # Source0-md5:	8d5d6191b14ef16bc75975d1f206fa72
+Patch0:		confdir.patch
 URL:		http://www.dokuwiki.org/plugin:redirect
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.520
@@ -31,6 +32,7 @@
 %prep
 %setup -qc
 mv *-%{plugin}-*/* .
+%patch0 -p1
 
 version=$(awk '/^date/{print $2}' plugin.info.txt)
 if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
@@ -67,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/05/30 13:32:46  glen
+- put config to confdir
+
 Revision 1.2  2012/05/30 13:23:32  glen
 - add default config placeholder
 

================================================================
Index: packages/dokuwiki-plugin-redirect/confdir.patch
diff -u /dev/null packages/dokuwiki-plugin-redirect/confdir.patch:1.1
--- /dev/null	Wed May 30 15:32:51 2012
+++ packages/dokuwiki-plugin-redirect/confdir.patch	Wed May 30 15:32:46 2012
@@ -0,0 +1,31 @@
+--- 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-20100613/admin.php	2011-02-06 20:26:05.000000000 +0200
++++ dokuwiki-plugin-redirect-20100613/admin.php	2012-05-30 16:28:48.784865018 +0300
+@@ -37,7 +37,7 @@
+      */
+     function handle() {
+         if($_POST['redirdata']){
+-            if(io_saveFile(dirname(__FILE__).'/redirect.conf',$_POST['redirdata'])){
++            if(io_saveFile(DOKU_CONF.'/redirect.conf',$_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>';
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/dokuwiki-plugin-redirect/dokuwiki-plugin-redirect.spec?r1=1.2&r2=1.3