up to 20120918

diff --git a/confdir.patch b/confdir.patch
index 5f57659572ba4cb22bdc5c0b4b3790c1c7909dc5..f75dcd0dc7c3c66a162f8ee0a93d2760bb5eb11d 100644 (file)
--- a/confdir.patch
+++ b/confdir.patch
@@ -9,14 +9,14 @@
          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
+--- 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',$_POST['redirdata'])){
-+            if(io_saveFile(DOKU_CONF.'/redirect.conf',$_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);
              }
          }

diff --git a/dokuwiki-plugin-redirect.spec b/dokuwiki-plugin-redirect.spec
index a36d268696a92c3986b91d7aa2049c683647cfde..739383cfe8c0f92777823d48efedc0e14745a4e8 100644 (file)
--- a/dokuwiki-plugin-redirect.spec
+++ b/dokuwiki-plugin-redirect.spec
@@ -3,12 +3,13 @@
 %include       /usr/lib/rpm/macros.php
 Summary:       DokuWiki redirect plugin
 Name:          dokuwiki-plugin-%{plugin}
-Version:       20100613
-Release:       6
+Version:       20120918
+Release:       0.1
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://github.com/splitbrain/dokuwiki-plugin-%{plugin}/tarball/master#/%{plugin}-%{version}.tgz
-# Source0-md5: 8d5d6191b14ef16bc75975d1f206fa72
+#Source0:      http://github.com/splitbrain/dokuwiki-plugin-%{plugin}/tarball/master#/%{plugin}-%{version}.tgz
+Source0:       https://github.com/glensc/dokuwiki-plugin-redirect/tarball/cleantext/#/%{plugin}-%{version}.tgz
+# Source0-md5: e75c0f0462e790c4824125aca8e0b5fc
 Patch0:                confdir.patch
 URL:           http://www.dokuwiki.org/plugin:redirect
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -44,6 +45,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{plugindir}
 cp -a . $RPM_BUILD_ROOT%{plugindir}
 %{__rm} $RPM_BUILD_ROOT%{plugindir}/README
+%{__rm} $RPM_BUILD_ROOT%{plugindir}/*/.gitignore
 
 install -d $RPM_BUILD_ROOT%{dokuconf}
 touch $RPM_BUILD_ROOT%{dokuconf}/%{plugin}.conf