commit a8bc33b8209a9d1ec99b9d42832a705e0a1f9633
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Sat Sep 8 18:05:38 2012 +0300
up to 2012-09-08 snap
dokuwiki.spec | 10 ++++++----
task-1821.patch | 12 ++++++------
2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index bc221c3..116d449 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,4 +1,4 @@
-%define subver 2012-07-30
+%define subver 2012-09-08
%define ver %(echo %{subver} | tr -d -)
%define snap 1
%define php_min_version 5.2.4
@@ -7,12 +7,12 @@ Summary: PHP-based Wiki webapplication
Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP
Name: dokuwiki
Version: %{ver}
-Release: 0.12
+Release: 0.19
License: GPL v2
Group: Applications/WWW
#Source0:
http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
Source0:
http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
-# Source0-md5: fbe020fa8a4929d3376db23d195548a8
+# Source0-md5: 7ad81d1b833c9e0c7356afc2d5af2633
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Source3: http://glen.alkohol.ee/pld/jude.png
@@ -338,7 +338,9 @@ exit 0
%{_appdir}/inc/parser
%dir %{_appdir}/lib
-%dir %{_appdir}/lib/plugins
+# allow plugins dir permission change to allow installation of plugins from
admin
+# however does not work with rpm 4.5
+%dir %config %verify(not mode group) %{_appdir}/lib/plugins
%dir %{_appdir}/lib/plugins/acl
%{_appdir}/lib/plugins/acl/*.*
%{_appdir}/lib/plugins/acl/pix
diff --git a/task-1821.patch b/task-1821.patch
index 88bc731..08257be 100644
--- a/task-1821.patch
+++ b/task-1821.patch
@@ -33,17 +33,17 @@
http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev
'difftype' => $type,
));
ptln('<br /><a class="wikilink1"
href="'.$diffurl.'">'.$lang['difflink'].'</a>');
---- dokuwiki-2012-07-16/inc/common.php~ 2012-07-16 11:55:03.000000000
+0300
-+++ dokuwiki-2012-07-16/inc/common.php 2012-07-16 11:58:26.626127713 +0300
-@@ -1178,6 +1178,8 @@
+--- dokuwiki-2012-09-08/inc/common.php~ 2012-09-08 17:57:46.000000000
+0300
++++ dokuwiki-2012-09-08/inc/common.php 2012-09-08 17:58:26.151228475 +0300
+@@ -1179,6 +1179,8 @@
} elseif($rev) {
$subject = $lang['mail_changed'].' '.$id;
$trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
+ $rev2 = $INFO['meta']['date']['modified'];
+ $trep['DIFFPAGE']= wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&');
- $df = new Diff(explode("\n", rawWiki($id, $rev)),
- explode("\n", rawWiki($id)));
- $dformat = new UnifiedDiffFormatter();
+ $old_content = rawWiki($id, $rev);
+ $new_content = rawWiki($id);
+ $df = new Diff(explode("\n", $old_content),
@@ -1191,6 +1193,7 @@
} else {
$subject = $lang['mail_newpage'].' '.$id;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/a8bc33b8209a9d1ec99b9d42832a705e0a1f9633
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
