packages: dokuwiki/dokuwiki.spec, dokuwiki/more-buttons.patch - adopt more ...

Sat Feb 11 14:22:21 CET 2012

Author: glen                         Date: Sat Feb 11 13:22:21 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adopt more buttons patch from dokuwiki-tpl-sidebar

---- Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.103 -> 1.104) , more-buttons.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.103 packages/dokuwiki/dokuwiki.spec:1.104

--- packages/dokuwiki/dokuwiki.spec:1.103	Fri Jan 27 08:42:17 2012
+++ packages/dokuwiki/dokuwiki.spec	Sat Feb 11 14:22:16 2012
@@ -7,13 +7,11 @@
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	%{ver}
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/WWW
-#Source0:	https://github.com/splitbrain/dokuwiki/tarball/master#/%{name}.tgz
 Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
 # Source0-md5:	da7ec30fc51c48035adc48dc0535a317
-#Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	http://glen.alkohol.ee/pld/jude.png
@@ -49,6 +47,7 @@
 Patch21:	task-1821.patch
 Patch22:	adldap.patch
 Patch23:	backlink-rightside.patch
+Patch24:	more-buttons.patch
 URL:		http://www.dokuwiki.org/dokuwiki
 BuildRequires:	fslint
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
@@ -138,6 +137,7 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %patch66 -p1
 
@@ -385,6 +385,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2012/02/11 13:22:16  glen
+- adopt more buttons patch from dokuwiki-tpl-sidebar
+
 Revision 1.103  2012/01/27 07:42:17  glen
 - up to 2012-01-25 Angua release
 

================================================================
Index: packages/dokuwiki/more-buttons.patch
diff -u packages/dokuwiki/more-buttons.patch:1.5 packages/dokuwiki/more-buttons.patch:1.6
--- packages/dokuwiki/more-buttons.patch:1.5	Tue Sep  1 12:00:02 2009
+++ packages/dokuwiki/more-buttons.patch	Sat Feb 11 14:22:16 2012
@@ -1,14 +1,14 @@
---- sidebar/main.php    2009-09-01 12:51:33.000000000 +0300
-+++ sidebar/main.php    2009-09-01 12:51:33.000000000 +0300
-@@ -18,6 +18,8 @@
+--- dokuwiki-rc2011-11-10/lib/tpl/default/main.php~	2012-02-11 15:16:44.000000000 +0200
++++ dokuwiki-rc2011-11-10/lib/tpl/default/main.php	2012-02-11 15:17:57.971423003 +0200
+@@ -15,6 +15,8 @@
  // must be run from within DokuWiki
  if (!defined('DOKU_INC')) die();
  
 +global $REV;
 +
- // include functions that provide sidebar functionality
- @require_once(dirname(__FILE__).'/tplfn_sidebar.php');
  ?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 @@ -66,6 +68,28 @@
        </div>
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.103&r2=1.104&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/more-buttons.patch?r1=1.5&r2=1.6&f=u

