Author: glen Date: Tue Mar 23 09:01:44 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 0.10.0 (20100218)
---- Files affected:
packages/dokuwiki-plugin-pagemove:
dokuwiki-plugin-pagemove-redirectlinks.patch (1.1 -> 1.2) ,
dokuwiki-plugin-pagemove-selflinks.patch (1.1 -> 1.2) ,
dokuwiki-plugin-pagemove.spec (1.8 -> 1.9)
---- Diffs:
================================================================
Index:
packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-redirectlinks.patch
diff -u
packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-redirectlinks.patch:1.1
packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-redirectlinks.patch:1.2
---
packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-redirectlinks.patch:1.1
Mon Feb 25 18:09:38 2008
+++
packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-redirectlinks.patch
Tue Mar 23 10:01:37 2010
@@ -1,11 +1,11 @@
---- pagemove/admin.php 2008-02-25 19:02:48.062065053 +0200
-+++ pagemove/admin.php 2008-02-25 19:01:41.271159305 +0200
-@@ -411,7 +411,8 @@
+--- pagemove/admin.php~ 2010-03-22 15:40:57.000000000 +0200
++++ pagemove/admin.php 2010-03-22 15:42:35.999975148 +0200
+@@ -698,7 +698,8 @@
function _pm_updatelinks(&$text, $links)
{
foreach( $links as $old => $new ) {
-- $text = preg_replace( '#\[\[' . $old . '((\]\])|[\|\#])#i', '[[' .
$new . '\1', $text);
-+ $text = preg_replace( '#\[\[' . $old . '(\]\]|[\|\#])#i', '[[' . $new
. '\1', $text);
+- $text = preg_replace( '#\[\[:?' . $old . '((\]\])|[\|\#])#i', '[[' .
$new . '\1', $text);
++ $text = preg_replace( '#\[\[:?' . $old . '(\]\]|[\|\#])#i', '[[' .
$new . '\1', $text);
+ $text = preg_replace( '#~~REDIRECT>' . $old . '(~~|[\|\#])#i',
'~~REDIRECT>' . $new . '\1', $text);
}
}
@@ -38,18 +38,20 @@
//get text
$text = io_readfile($base.'/'.$file);
-@@ -589,7 +597,13 @@
+--- pagemove/admin.php~ 2010-03-22 15:44:35.000000000 +0200
++++ pagemove/admin.php 2010-03-22 15:45:49.644880286 +0200
+@@ -770,7 +770,13 @@
//match all links
//FIXME may be incorrect because of code blocks
// CamelCase isn't supported, too
-- preg_match_all('#\[\[(.+?)\]\]#si',$text,$matches,PREG_SET_ORDER);
+- preg_match_all('#{{(.[^>]+?)}}#si',$text,$matches,PREG_SET_ORDER);
+ $matches = array();
-+ if (preg_match_all('#\[\[(.+?)\]\]#s',$text,$m,PREG_SET_ORDER)) {
++ if
(preg_match_all('#{{(.[^>]+?)}}#si',$text,$matches,PREG_SET_ORDER)) {
+ $matches = array_merge($matches, $m);
-+ }
++ }
+ if (preg_match_all('#~~REDIRECT>(.+?)~~#s',$text,$m,PREG_SET_ORDER)) {
+ $matches = array_merge($matches, $m);
+ }
foreach($matches as $match){
//get ID from link and discard most non wikilinks
- list($mid) = split('[\|#]',$match[1],2);
+ list($mid) = split('(\?|\|)',$match[1],2);
================================================================
Index:
packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-selflinks.patch
diff -u
packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-selflinks.patch:1.1
packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-selflinks.patch:1.2
---
packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-selflinks.patch:1.1
Mon Feb 25 21:36:29 2008
+++ packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-selflinks.patch
Tue Mar 23 10:01:37 2010
@@ -1,15 +1,12 @@
---- pagemove/admin.php 2008-02-25 19:03:30.679918614 +0200
-+++ pagemove/admin.php 2008-02-25 22:29:07.427283018 +0200
-@@ -213,24 +213,36 @@
- saveWikiText($opts['new_id'], $this->text,
- sprintf($this->lang[$lang_key], $ID, $opts['new_id']));
-
-- //Delete the orginal file.
-- //saveWikiText($ID, '', $this->lang['pm_movedto'].$opts['new_id']);
- if (@file_exists(wikiFN($opts['new_id']))) @unlink(wikiFN($ID));
-
-- //Loop through backlinks
-+ // replace our old id with new one as we already renamed the page
but
+--- pagemove/admin.php~ 2010-03-22 15:48:44.000000000 +0200
++++ pagemove/admin.php 2010-03-22 15:52:23.529214700 +0200
+@@ -600,22 +600,36 @@
+ //saveWikiText($ID, '', $this->lang['pm_movedto'].$opts['new_id']);
+ //if (@file_exists(wikiFN($opts['new_id']))) @unlink(wikiFN($ID));
+ if (@file_exists(wikiFN($opts['new_id']))) saveWikiText($ID,
'',$this->lang['pm_delete'] );
+-
++
++ // replace our old id with new one as we already renamed the page
but
+ // there might be backlinks (links to self in this case).
+ $opts['id'] = cleanID($opts['ns'].':'.$opts['name']);
+ $selfmod = isset($backlinks[$opts['id']]);
@@ -17,23 +14,23 @@
+ $backlinks[$opts['new_id']] = $backlinks[$opts['id']];
+ unset($backlinks[$opts['id']]);
+ }
-+
-+ // Loop through backlinks
+
+ //Loop through backlinks
foreach($backlinks as $backlink => $links){
- $this->_pm_updatebacklinks($backlink, $links, $opts, $brackets);
+ $this->_pm_updatebacklinks($backlink, $links, $opts);
}
-
+
//Move the old revisions
$this->_pm_movemeta('olddir',
'/^'.$opts['name'].'\.[0-9]{10}\.txt(\.gz)?$/', $opts);
-- //Set things up to display the new page.
+ // remove cache. again if we ourselves were modified (due backlinks)
+ if ($selfmod) {
+ $cache = new cache_instructions($opts['new_id'],
wikiFN($opts['new_id']));
+ $cache->removeCache();
+ }
+
+ //Set things up to display the new page.
io_saveFile($conf['cachedir'].'/purgefile',time());
- $ID = $opts['new_id'];
- $ACT = 'show';
@@ -66,12 +63,3 @@
unlock($id);
}
-@@ -627,4 +639,6 @@
- }
- }
-
--}
-\ No newline at end of file
-+}
-+
-+// vim:set ts=2 et sw=2
================================================================
Index: packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove.spec
diff -u packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove.spec:1.8
packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove.spec:1.9
--- packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove.spec:1.8 Wed Jan
28 15:29:12 2009
+++ packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove.spec Tue Mar
23 10:01:37 2010
@@ -3,13 +3,12 @@
Summary: DokuWiki PageMove plugin
Summary(pl.UTF-8): Wtyczka PageMove dla DokuWiki
Name: dokuwiki-plugin-%{plugin}
-Version: 0.9.15a
+Version: 0.10.0
Release: 1
License: GPL v2
Group: Applications/WWW
-# Source0Download:
http://www.isection.co.uk/lib/exe/fetch.php?media=pagemove_20070722.zip
-Source0: pagemove_20070722.zip
-# Source0-md5: f2cc2a57d40b877a335b52009e4cc072
+Source0:
http://acodeas.de/plugins/Version%{version}-pagemove_20100218.zip
+# Source0-md5: 48d2d8dde2794a9a5af5344623d608e8
Patch0: %{name}-redirectlinks.patch
Patch1: %{name}-selflinks.patch
URL: http://www.isection.co.uk/doku.php
@@ -53,6 +52,9 @@
mv lang/es/pagemove.txt{.txt,}
mv lang/pl/pagemove.txt{.txt,}
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{plugindir}
@@ -90,6 +92,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.9 2010/03/23 09:01:37 glen
+- up to 0.10.0 (20100218)
+
Revision 1.8 2009/01/28 14:29:12 glen
- refresh dw cache on install
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-redirectlinks.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove-selflinks.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-plugin-pagemove/dokuwiki-plugin-pagemove.spec?r1=1.8&r2=1.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
