[dokuwiki] Update to the latest upstream

[Adam Tkac]

commit 823bdc3663640560a953e3ec2cb3124b481b3939
Author: Adam Tkac <adam.tkac at geodis.cz>
Date:   Tue Sep 3 14:13:51 2013 +0200

    Update to the latest upstream
    
    Signed-off-by: Adam Tkac <adam.tkac at geodis.cz>

 dokuwiki-rm-bundled-libs.patch |   20 ++++++++++----------
 dokuwiki.spec                  |   11 +++++++----
 2 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/dokuwiki-rm-bundled-libs.patch b/dokuwiki-rm-bundled-libs.patch
index cab029d..cf299b8 100644
--- a/dokuwiki-rm-bundled-libs.patch
+++ b/dokuwiki-rm-bundled-libs.patch
@@ -1,7 +1,7 @@
-diff -ruN dokuwiki-2012-10-13.orig/inc/load.php dokuwiki-2012-10-13/inc/load.php
---- dokuwiki-2012-10-13.orig/inc/load.php	2012-10-13 13:25:31.000000000 +0200
-+++ dokuwiki-2012-10-13/inc/load.php	2012-10-20 14:32:48.037047032 +0200
-@@ -61,7 +61,7 @@
+diff -up dokuwiki-2013-05-10a/inc/load.php.orig dokuwiki-2013-05-10a/inc/load.php
+--- dokuwiki-2013-05-10a/inc/load.php.orig	2013-06-16 22:03:48.000000000 +0200
++++ dokuwiki-2013-05-10a/inc/load.php	2013-09-03 14:11:06.632296194 +0200
+@@ -60,7 +60,7 @@ function load_autoload($name){
          'cache_renderer'        => DOKU_INC.'inc/cache.php',
          'Doku_Event'            => DOKU_INC.'inc/events.php',
          'Doku_Event_Handler'    => DOKU_INC.'inc/events.php',
@@ -10,19 +10,19 @@ diff -ruN dokuwiki-2012-10-13.orig/inc/load.php dokuwiki-2012-10-13/inc/load.php
          'Input'                 => DOKU_INC.'inc/Input.class.php',
          'JpegMeta'              => DOKU_INC.'inc/JpegMeta.php',
          'SimplePie'             => DOKU_INC.'inc/SimplePie.php',
-@@ -70,7 +70,7 @@
+@@ -69,7 +69,7 @@ function load_autoload($name){
          '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 -ruN dokuwiki-2012-10-13.orig/inc/parserutils.php dokuwiki-2012-10-13/inc/parserutils.php
---- dokuwiki-2012-10-13.orig/inc/parserutils.php	2012-10-13 13:25:31.000000000 +0200
-+++ dokuwiki-2012-10-13/inc/parserutils.php	2012-10-20 14:35:18.459049966 +0200
-@@ -773,14 +773,14 @@
+diff -up dokuwiki-2013-05-10a/inc/parserutils.php.orig dokuwiki-2013-05-10a/inc/parserutils.php
+--- dokuwiki-2013-05-10a/inc/parserutils.php.orig	2013-06-16 22:03:48.000000000 +0200
++++ dokuwiki-2013-05-10a/inc/parserutils.php	2013-09-03 14:10:36.965839661 +0200
+@@ -695,14 +695,14 @@ function p_xhtml_cached_geshi($code, $la
      $cache = getCacheName($language.$code,".code");
      $ctime = @filemtime($cache);
      if($ctime && !$INPUT->bool('purge') &&
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 38431f5..a0744b0 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,11 +1,11 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.18.20121013%{?dist}
+Release:	0.19.20130510a%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
 URL:		http://www.dokuwiki.org/dokuwiki
-Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2012-10-13.tgz
+Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2013-05-10a.tgz
 #Fedora specific patches to use fedora packaged libraries
 Patch1:		dokuwiki-rm-bundled-libs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +34,7 @@ BuildArch:	noarch
 Configures DokuWiki to run in SELinux enabled environments.
 
 %prep
-%setup -q -n %{name}-2012-10-13
+%setup -q -n %{name}-2013-05-10a
 
 # Remove bundled code
 rm inc/EmailAddressValidator.php
@@ -202,7 +202,10 @@ fi
 %doc DOKUWIKI-SELINUX.README
 
 %changelog
-* Tue Sep 03 2013 Adam Tkac <adam.tkac at geodis.cz> - 0-0.18.20121013
+* Tue Sep 03 2013 Adam Tkac <vonsch at gmail.com> - 0-0.19.20121013
+- update to the latest upstream
+
+* Tue Sep 03 2013 Adam Tkac <vonsch at gmail.com> - 0-0.18.20121013
 - remove bundled code in specfile instead of via patch
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.17.20121013