up to rc2013-10-28 "Binky"

the default template was removed

diff --git a/backlink-rightside.patch b/backlink-rightside.patch
deleted file mode 100644 (file)
index 4f951b3..0000000
--- a/backlink-rightside.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- dokuwiki-rc2011-11-10/lib/tpl/default/layout.css   2009-01-27 04:40:10.000000000 +0200
-+++ dokuwiki-rc2011-11-10/lib/tpl/default/layout.css   2009-01-27 17:20:21.075995761 +0200
-@@ -11,7 +11,7 @@
- }
- 
- div.dokuwiki .pagename {
--  float: left;
-+  float: right;
-   font-size: 200%;
-   font-weight: bolder;
-   color: __background_alt__;
-@@ -25,10 +25,10 @@
- }
- 
- div.dokuwiki .logo {
--  float: right;
-+  float: left;
-   font-size: 220%;
-   font-weight: bolder;
--  text-align: right;
-+  text-align: left;
-   vertical-align: middle;
- }
- 
---- dokuwiki-rc2011-11-10/lib/tpl/default/main.php     2009-01-27 04:40:10.000000000 +0200
-+++ dokuwiki-rc2011-11-10/lib/tpl/default/main.php     2009-01-27 17:20:32.584616202 +0200
-@@ -47,12 +47,12 @@
-   <div class="stylehead">
- 
-     <div class="header">
--      <div class="pagename">
--        [[<?php tpl_link(wl($ID,'do=backlink'),tpl_pagetitle($ID,true),'title="'.$lang['btn_backlink'].'"')?>]]
--      </div>
-       <div class="logo">
-         <?php tpl_link(wl(),$conf['title'],'name="dokuwiki__top" id="dokuwiki__top" accesskey="h" title="[H]"')?>
-       </div>
-+      <div class="pagename">
-+        [[<?php tpl_link(wl($ID,'do=backlink'),tpl_pagetitle($ID,true),'title="'.$lang['btn_backlink'].'"')?>]]
-+      </div>
- 
-       <div class="clearer"></div>
-     </div>

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index c7ed51f79e8477eb47a00ef523ab66191e4b430c..aa1de9944b73d86c4b49119264f5798a698745fa 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -21,14 +21,14 @@
  $conf['userewrite']  = 0;                //this makes nice URLs: 0: off 1: .htaccess 2: internal
  $conf['useslash']    = 0;                //use slash instead of colon? only when rewrite is on
  $conf['sepchar']     = '_';              //word separator character in page names; may be a
---- dokuwiki-2013-05-10/install.php~   2013-05-28 09:35:09.731229689 +0300
-+++ dokuwiki-2013-05-10/install.php    2013-05-28 09:36:57.022834802 +0300
-@@ -57,7 +57,7 @@
-     '2011-11-10'   => 'b46ff19a7587966ac4df61cbab1b8b31',
+--- dokuwiki-rc2013-10-28/install.php~ 2013-11-13 22:24:06.193631633 +0200
++++ dokuwiki-rc2013-10-28/install.php  2013-11-13 22:24:34.423188022 +0200
+@@ -58,7 +58,7 @@
      '2012-01-25'   => '72c083c73608fc43c586901fd5dabb74',
      '2012-09-10'   => 'eb0b3fc90056fbc12bac6f49f7764df3',
--    '2013-05-10'   => '7b62b75245f57f122d3e0f8ed7989623',
-+    '2013-05-10'   => '3a8e2c95eae3b9ec9af1f0e08f15e993',
+     '2013-05-10'   => '7b62b75245f57f122d3e0f8ed7989623',
+-    '2013-10-28'   => '263c76af309fbf083867c18a34ff5214',
++    '2013-10-28'   => '5527d61a24b4feb0ade5a952848108fb',
  );
  
  

diff --git a/dokuwiki.spec b/dokuwiki.spec
index a1958e14ba9c1239dc093081f32cf70c5cb12b14..b9263cbe340c8faf9986c4c9898e193e6a0bc100 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,19 +1,19 @@
-%define                subver  2013-05-10a
+%define                subver  2013-10-28
 %define                ver             %(echo %{subver} | tr -d -)
 #define                snap    1
-#define                rc_     1
+%define                rc_     1
 %define                php_min_version 5.2.4
 %include       /usr/lib/rpm/macros.php
 Summary:       PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       1
+Release:       0.1
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: 4d6330ec652d7ed706a6b555a0b8adb8
-#Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
+#Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+Source0:       http://download.dokuwiki.org/src/dokuwiki/%{name}-rc%{subver}.tgz
+# Source0-md5: f476b54a3679d35cdd8746db57c9c6a3
 #Source0:      http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
@@ -46,7 +46,6 @@ Patch19:      pld-branding.patch
 Patch20:       fixprivilegeescalationbug.diff
 Patch21:       task-1821.patch
 Patch22:       adldap.patch
-Patch23:       backlink-rightside.patch
 Patch24:       more-buttons.patch
 URL:           https://www.dokuwiki.org/
 BuildRequires: fslint
@@ -149,7 +148,6 @@ touch data/pages/playground/playground.txt
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
 %patch24 -p1
 
 %patch66 -p1
@@ -240,7 +238,6 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/jude.png
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/asta.png
 
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_appdir}/lib/tpl/dokuwiki/images/button-pld.png
-ln $RPM_BUILD_ROOT%{_appdir}/lib/tpl/{dokuwiki,default}/images/button-pld.png
 
 # hardlink identical icons.
 findup -m $RPM_BUILD_ROOT

diff --git a/interwiki-outputonly.patch b/interwiki-outputonly.patch
index 90bc40bc1699a8cd10b3a6247e07600e676e586a..27fe9a5b05cf01309290b4dc3dadfebf10710f2f 100644 (file)
--- a/interwiki-outputonly.patch
+++ b/interwiki-outputonly.patch
@@ -1,11 +1,11 @@
---- dokuwiki-2009-02-14/inc/parser/xhtml.php   2009-07-28 16:51:06.599541994 +0300
-+++ dokuwiki/inc/parser/xhtml.php      2009-07-28 16:53:48.144936039 +0300
-@@ -569,7 +569,7 @@
+--- dokuwiki-rc2013-10-28/inc/parser/xhtml.php~        2013-11-13 22:20:29.920364255 +0200
++++ dokuwiki-rc2013-10-28/inc/parser/xhtml.php 2013-11-13 22:20:52.460009959 +0200
+@@ -686,7 +686,7 @@
  
      /**
      */
--    function interwikilink($match, $name = NULL, $wikiName, $wikiUri) {
-+    function interwikilink($match, $name = NULL, $wikiName, $wikiUri, $returnonly = false) {
+-    function interwikilink($match, $name = null, $wikiName, $wikiUri) {
++    function interwikilink($match, $name = null, $wikiName, $wikiUri, $returnonly = false) {
          global $conf;
  
          $link = array();

diff --git a/more-buttons.patch b/more-buttons.patch
index cef2d152bf6710098eceafe919c0e351361a04fc..d1e6cc046b3786dbd1e8c29a1f605414fd9c6acf 100644 (file)
--- a/more-buttons.patch
+++ b/more-buttons.patch
@@ -1,46 +1,3 @@
---- 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;
-+
- ?>
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-@@ -66,6 +68,31 @@
-       </div>
- 
-       <div class="bar-right" id="bar__topright">
-+        <?php
-+        if (!plugin_isdisabled('html2pdf') || !plugin_isdisabled('dw2pdf')) { ?>
-+        <form class="button" method="get" action="<?php wl($ID)?>">
-+          <div class="no">
-+            <button type="submit" class="button">
-+              <img src="<?php echo DOKU_BASE?>lib/images/fileicons/pdf.png" alt="PDF Export" />
-+              Export to PDF
-+            </button>
-+            <input type="hidden" name="do" value="export_pdf" />
-+            <input type="hidden" name="id" value="<?php echo $ID?>" />
-+            <input type="hidden" name="rev" value="<?php echo $REV ?>" />
-+          </div>
-+        </form>
-+        <?php } ?>
-+        <?php
-+        if (!plugin_isdisabled('odt')) { ?>
-+        <form class="button" method="get" action="<?php wl($ID)?>">
-+          <div class="no">
-+            <input type="submit" value="Export to ODT" class="button" />
-+            <input type="hidden" name="do" value="export_odt" />
-+            <input type="hidden" name="id" value="<?php echo $ID?>" />
-+            <input type="hidden" name="rev" value="<?php echo $REV ?>" />
-+          </div>
-+        </form>
-+        <?php } ?>
-         <?php tpl_button('recent')?>
-         <?php tpl_searchform()?>&nbsp;
-       </div>
 --- dokuwiki/lib/tpl/dokuwiki/tpl_header.php   2012-09-01 22:54:16.816853164 +0300
 +++ dokuwiki-2012-09-01/lib/tpl/dokuwiki/tpl_header.php        2012-09-01 23:14:51.484803869 +0300
 @@ -64,6 +64,19 @@

diff --git a/pld-branding.patch b/pld-branding.patch
index e903b6a3b75839a8b135bb91ac8f0b7cba79aebe..340b8d8dc849b39d40e4e7c3585d551289e5f261 100644 (file)
--- a/pld-branding.patch
+++ b/pld-branding.patch
@@ -9,17 +9,6 @@
  $conf['start']       = 'start';           //name of start page
  $conf['lang']        = 'en';              //your language
  $conf['template']    = 'dokuwiki';         //see lib/tpl directory
---- dokuwiki-0.0.20090214.orig/lib/tpl/default/footer.html     2009-02-14 19:22:01.000000000 +0100
-+++ dokuwiki-0.0.20090214/lib/tpl/default/footer.html  2009-02-14 19:23:14.000000000 +0100
-@@ -28,6 +28,8 @@
- 
-   <a <?php echo $tgt?> href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS"><img src="<?php echo DOKU_TPL; ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
- 
-+  <a <?php echo $tgt?> href="http://www.pld-linux.org/" title="PLD Linux"><img src="<?php echo DOKU_TPL; ?>images/button-pld.png" width="80" height="15" alt="PLD Linux" /></a>
-+
-   <a <?php echo $tgt?> href="http://dokuwiki.org/" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
- 
- <?php
 --- dokuwiki/lib/tpl/dokuwiki/tpl_footer.php~  2012-09-10 18:15:12.000000000 +0300
 +++ dokuwiki/lib/tpl/dokuwiki/tpl_footer.php   2012-09-16 18:27:15.717037872 +0300
 @@ -24,6 +24,8 @@

diff --git a/style-width.patch b/style-width.patch
index 9befedf737f9bd68f5d435d68bff30dceca59a09..2062c9c48a129f98a6b028b855ff0264f4b02ec4 100644 (file)
--- a/style-width.patch
+++ b/style-width.patch
@@ -1,13 +1,13 @@
---- dokuwiki-2013-02-01/lib/tpl/dokuwiki/style.ini~    2013-01-28 00:59:02.000000000 +0200
-+++ dokuwiki-2013-02-01/lib/tpl/dokuwiki/style.ini     2013-02-01 01:26:47.771720871 +0200
-@@ -72,8 +72,8 @@
- __missing__         = "#d30"
+--- dokuwiki-rc2013-10-28/lib/tpl/dokuwiki/style.ini~  2013-10-28 21:28:57.000000000 +0200
++++ dokuwiki-rc2013-10-28/lib/tpl/dokuwiki/style.ini   2013-11-13 22:20:04.340766336 +0200
+@@ -78,8 +78,8 @@
+ __missing__         = "#d30"            ; @ini_missing
  
  ; site and sidebar widths
--__site_width__      = "75em"
--__sidebar_width__   = "16em"
-+__site_width__      = "90em"
-+__sidebar_width__   = "13em"
+-__site_width__      = "75em"            ; @ini_site_width
+-__sidebar_width__   = "16em"            ; @ini_sidebar_width
++__site_width__      = "90em"            ; @ini_site_width
++__sidebar_width__   = "13em"            ; @ini_sidebar_width
  ; cut off points for mobile devices
- __tablet_width__    = "979px"
- __phone_width__     = "480px"
+ __tablet_width__    = "800px"           ; @ini_tablet_width
+ __phone_width__     = "480px"           ; @ini_phone_width