updated to 2013-02-01

diff --git a/dokuwiki-geshi.patch b/dokuwiki-geshi.patch
index 0e1f884e44cf0781c57a149d218f27abe8fa2f62..916c4c17e23535fb2b6e26fc743b0a16107baa41 100644 (file)
--- a/dokuwiki-geshi.patch
+++ b/dokuwiki-geshi.patch
@@ -18,14 +18,14 @@
          $geshi->set_encoding('utf-8');
          $geshi->enable_classes();
          $geshi->set_header_type(GESHI_HEADER_PRE);
---- dokuwiki-rc2010-10-07/inc/load.php~        2010-10-07 11:08:13.000000000 +0300
-+++ dokuwiki-rc2010-10-07/inc/load.php 2010-10-07 21:23:57.072781806 +0300
-@@ -68,7 +68,7 @@
+--- dokuwiki-2013-02-01/inc/load.php~  2013-01-28 00:59:02.000000000 +0200
++++ dokuwiki-2013-02-01/inc/load.php   2013-02-01 01:27:39.317193573 +0200
+@@ -70,7 +70,7 @@
          'IXR_Client'            => DOKU_INC.'inc/IXR_Library.php',
          'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php',
          'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
 -        'GeSHi'                 => DOKU_INC.'inc/geshi.php',
 +        'GeSHi'                 => '/usr/share/php/geshi.php',
+         'Tar'                   => DOKU_INC.'inc/Tar.class.php',
          'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
          'ZipLib'                => DOKU_INC.'inc/ZipLib.class.php',
-         'DokuWikiFeedCreator'   => DOKU_INC.'inc/feedcreator.class.php',

diff --git a/dokuwiki-notify-respect-minor.patch b/dokuwiki-notify-respect-minor.patch
index 4ceecf3deed7c6f1c8968bd0a8133ba4b7da0409..47579bbc86a04f5e52f71fe652614dc874f56bde 100644 (file)
--- a/dokuwiki-notify-respect-minor.patch
+++ b/dokuwiki-notify-respect-minor.patch
@@ -1,10 +1,10 @@
---- dokuwiki-2012-07-08/inc/common.php~        2012-07-07 13:06:48.000000000 +0300
-+++ dokuwiki-2012-07-08/inc/common.php 2012-07-08 11:23:14.913603122 +0300
+--- dokuwiki-2013-02-01/inc/common.php~        2013-01-28 00:59:02.000000000 +0200
++++ dokuwiki-2013-02-01/inc/common.php 2013-02-01 01:29:08.204212401 +0200
 @@ -1110,6 +1110,7 @@
      // decide if there is something to do, eg. whom to mail
      if($who == 'admin') {
          if(empty($conf['notify'])) return false; //notify enabled?
 +        if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return; //skip minors
-         $text = rawLocale('mailtext');
-         $to   = $conf['notify'];
-         $bcc  = '';
+         $tpl = 'mailtext';
+         $to  = $conf['notify'];
+     } elseif($who == 'subscribers') {

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 3e411c918793d024a0c6c95be56e34fc9ed2a3b9..4e609cefddb7f8ac63f1b5088d4df0aa2de05afd 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,18 +1,18 @@
-%define                subver  2012-10-13
+%define                subver  2013-02-01
 %define                ver             %(echo %{subver} | tr -d -)
-#define                snap    1
+%define                snap    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:       2
+Release:       0.2
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: a910ebb2fcca13c0337ed672304c4ad4
-#Source0:      http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
+#Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+Source0:       http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
+# Source0-md5: 639847b28f8547c73179fb5846193890
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       http://glen.alkohol.ee/pld/jude.png
@@ -136,13 +136,13 @@ touch data/pages/playground/playground.txt
 %patch6 -p1
 %patch8 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p1
+#patch11 -p1 UPDATE
+#%patch12 -p1 OUTDATED?
 %patch14 -p1
 %patch15 -p1
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
+#%%patch21 -p1 CHECKME
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
@@ -390,6 +390,7 @@ exit 0
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/media/wiki/dokuwiki-128.png
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/dokuwiki.txt
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/syntax.txt
+%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/welcome.txt
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/playground/playground.txt
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/security.png
 

diff --git a/style-width.patch b/style-width.patch
index 80bd123ad8f3d09f9e332d9855654654fb41f0f7..9befedf737f9bd68f5d435d68bff30dceca59a09 100644 (file)
--- a/style-width.patch
+++ b/style-width.patch
@@ -1,10 +1,13 @@
---- dokuwiki/lib/tpl/dokuwiki/style.ini~       2012-08-29 18:37:22.000000000 +0300
-+++ dokuwiki/lib/tpl/dokuwiki/style.ini        2012-09-10 17:58:56.000000000 +0300
-@@ -68,5 +68,5 @@
- __highlight__       = "#ff9"
+--- 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"
  
  ; site and sidebar widths
 -__site_width__      = "75em"
 -__sidebar_width__   = "16em"
 +__site_width__      = "90em"
 +__sidebar_width__   = "13em"
+ ; cut off points for mobile devices
+ __tablet_width__    = "979px"
+ __phone_width__     = "480px"