]> git.pld-linux.org Git - packages/dokuwiki.git/commitdiff
- adopt more buttons patch from dokuwiki-tpl-sidebar
authorElan Ruusamäe <glen@pld-linux.org>
Sat, 11 Feb 2012 13:22:16 +0000 (13:22 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    dokuwiki.spec -> 1.104
    more-buttons.patch -> 1.6

dokuwiki.spec
more-buttons.patch

index 6c151b5db7db3ba07e31c66f5b4fc23a140775d1..25da9a73312a5e1ba4847b85eb650b22b1e3dafb 100644 (file)
@@ -6,13 +6,11 @@ Summary:      PHP-based Wiki webapplication
 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
@@ -48,6 +46,7 @@ Patch20:      fixprivilegeescalationbug.diff
 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
@@ -137,6 +136,7 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %patch66 -p1
 
index 9e61a383eacadacf8f932b0797f5ec653471a7c1..82adb973d621882ea9674645abec776c1ec4c1ad 100644 (file)
@@ -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>
  
This page took 0.219639 seconds and 4 git commands to generate.