[dokuwiki/f17: 7/7] Merge branch 'master' into f17

[topdog]

commit 8f078604b6ad63e1c30c061751c5dddca9c33d11
Merge: 9be2d73 76baa02
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date:   Sat Oct 20 15:24:49 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	dokuwiki-rm-bundled-libs.patch
    	dokuwiki.spec
    	sources

 .gitignore                     |    4 +
 dokuwiki-rm-bundled-libs.patch |26111 +++++++++++++++++++++++++++-------------
 dokuwiki.spec                  |   30 +-
 sources                        |    4 +
 4 files changed, 17555 insertions(+), 8594 deletions(-)
---
diff --cc .gitignore
index 47a0161,61952e0..58b844c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,7 @@@
  dokuwiki-2009-12-25c.tgz
  /dokuwiki-2011-05-25a.tgz
  /dokuwiki-2012-01-25b.tgz
++<<<<<<< HEAD
++=======
+ /dokuwiki-2012-10-13.tgz
++>>>>>>> master
diff --cc dokuwiki-rm-bundled-libs.patch
index dee9ee5,097892a..54dbe02
--- a/dokuwiki-rm-bundled-libs.patch
+++ b/dokuwiki-rm-bundled-libs.patch
@@@ -54057,13 -62975,13 +62975,20 @@@ diff -ruN dokuwiki-2012-10-13.orig/inc/
           'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
           'ZipLib'                => DOKU_INC.'inc/ZipLib.class.php',
           'DokuWikiFeedCreator'   => DOKU_INC.'inc/feedcreator.class.php',
++<<<<<<< HEAD
 +diff -ruN dokuwiki-2012-01-25b.orig/inc/parserutils.php dokuwiki-2012-01-25b/inc/parserutils.php
 +--- dokuwiki-2012-01-25b.orig/inc/parserutils.php	2012-07-13 13:13:57.000000000 +0200
 ++++ dokuwiki-2012-01-25b/inc/parserutils.php	2012-08-02 09:07:10.215010682 +0200
 +@@ -748,14 +748,14 @@
++=======
+ 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 @@
++>>>>>>> master
       $cache = getCacheName($language.$code,".code");
       $ctime = @filemtime($cache);
-      if($ctime && !$_REQUEST['purge'] &&
+      if($ctime && !$INPUT->bool('purge') &&
  -            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
  -            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
  +            $ctime > filemtime('/usr/share/php/geshi.php') &&                 // geshi changed
diff --cc dokuwiki.spec
index 701992b,9ba91ee..d99ed4d
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@@ -1,14 -1,13 +1,22 @@@
  Name:		dokuwiki
  Version:	0
++<<<<<<< HEAD
 +Release:	0.12.20120125.b%{?dist}
++=======
+ Release:	0.14.20121013%{?dist}
++>>>>>>> master
  Summary:	Standards compliant simple to use wiki
  Group:		Applications/Internet
  License:	GPLv2
  URL:		http://www.dokuwiki.org/dokuwiki
++<<<<<<< HEAD
 +Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2012-01-25b.tgz
++=======
+ Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2012-10-13.tgz
++>>>>>>> master
  #Fedora specific patches to use fedora packaged libraries
  Patch1:		dokuwiki-rm-bundled-libs.patch
 +#Patch2:         fix-CVE-2012-2129.patch
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildArch:	noarch
  Requires:	php-gd
@@@ -35,9 -34,8 +43,13 @@@ BuildArch:	noarc
  Configures DokuWiki to run in SELinux enabled environments.
  
  %prep
++<<<<<<< HEAD
 +%setup -q -n %{name}-2012-01-25b
++=======
+ %setup -q -n %{name}-2012-10-13
++>>>>>>> master
  %patch1 -p1 
 +#%patch2 -p1 
  
  chmod a-x inc/lang/az/*.{txt,html}
  
@@@ -190,10 -190,17 +204,24 @@@ f
  %doc DOKUWIKI-SELINUX.README
  
  %changelog
++<<<<<<< HEAD
 +* Thu Aug 02 2012 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.12.20120125.b
 +- Latest upstream
 +- Fix Bugzilla bugs #844726, #840255, #795487, #741384, #840686, #835145
 + 
++=======
+ * Sat Oct 20 2012 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.14.20121013
+ - Latest upstream
+ - Fix Bugzilla bugs #844726, #840255, #795487, #741384, #840686, #835145
+ 
+ * Thu Aug 02 2012 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.13.20120125.b
+ - Latest upstream
+ - Fix Bugzilla bugs #844726, #840255, #795487, #741384, #840686, #835145
+  
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.12.20110525.a
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
++>>>>>>> master
  * Tue Apr 24 2012 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.11.20110525.a
  - Fix CVE-2012-2129
  - Fix Bugzilla bugs #815123
diff --cc sources
index 63e2944,d41dfc7..e305e5a
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +6bceed04c3c38b3b251c70dfe2f9fca0  dokuwiki-2012-01-25b.tgz
++=======
+ a910ebb2fcca13c0337ed672304c4ad4  dokuwiki-2012-10-13.tgz
++>>>>>>> master