[dokuwiki/f16] Update to latest

[topdog]

commit fac4dd8a2001f5e498dcb5c3eb3277860bae8c74
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date:   Sat Aug 4 08:54:05 2012 +0200

    Update to latest

 .gitignore                     |    1 +
 dokuwiki-rm-bundled-libs.patch |    8 ++++----
 dokuwiki.spec                  |   21 ++++++++++++---------
 sources                        |    2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 97a6aa2..47a0161 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 dokuwiki-2009-12-25c.tgz
 /dokuwiki-2011-05-25a.tgz
+/dokuwiki-2012-01-25b.tgz
diff --git a/dokuwiki-rm-bundled-libs.patch b/dokuwiki-rm-bundled-libs.patch
index 1bc6c91..dee9ee5 100644
--- a/dokuwiki-rm-bundled-libs.patch
+++ b/dokuwiki-rm-bundled-libs.patch
@@ -54057,10 +54057,10 @@ diff -ruN dokuwiki-2011-05-25a.orig/inc/load.php dokuwiki-2011-05-25a/inc/load.p
          'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
          'ZipLib'                => DOKU_INC.'inc/ZipLib.class.php',
          'DokuWikiFeedCreator'   => DOKU_INC.'inc/feedcreator.class.php',
-diff -ruN dokuwiki-2011-05-25a.orig/inc/parserutils.php dokuwiki-2011-05-25a/inc/parserutils.php
---- dokuwiki-2011-05-25a.orig/inc/parserutils.php	2011-06-28 09:39:25.843706997 +0200
-+++ dokuwiki-2011-05-25a/inc/parserutils.php	2011-06-28 10:17:30.710735374 +0200
-@@ -743,14 +743,14 @@
+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 @@
      $cache = getCacheName($language.$code,".code");
      $ctime = @filemtime($cache);
      if($ctime && !$_REQUEST['purge'] &&
diff --git a/dokuwiki.spec b/dokuwiki.spec
index b10885e..60035dc 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,14 +1,14 @@
 Name:		dokuwiki
 Version:	0
-Release:	0.10.20110525.a%{?dist}
+Release:	0.11.20120125.b%{?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}-2011-05-25a.tgz
+Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2012-01-25b.tgz
 #Fedora specific patches to use fedora packaged libraries
 Patch1:		dokuwiki-rm-bundled-libs.patch
-Patch2:         fix-CVE-2012-2129.patch
+#Patch2:         fix-CVE-2012-2129.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Requires:	php-gd
@@ -35,9 +35,9 @@ BuildArch:	noarch
 Configures DokuWiki to run in SELinux enabled environments.
 
 %prep
-%setup -q -n %{name}-2011-05-25a
+%setup -q -n %{name}-2012-01-25b
 %patch1 -p1 
-%patch2 -p1 
+#%patch2 -p1 
 
 chmod a-x inc/lang/az/*.{txt,html}
 
@@ -167,7 +167,7 @@ fi
 %{_datadir}/%{name}/lib/scripts
 %{_datadir}/%{name}/lib/styles
 %{_datadir}/%{name}/lib/tpl
-%{_datadir}/%{name}/lib/_fla
+#%{_datadir}/%{name}/lib/_fla
 %attr(0755,apache,apache) %dir %{_datadir}/%{name}/lib/plugins
 %{_datadir}/%{name}/lib/plugins/*
 %{_datadir}/%{name}/inc
@@ -190,9 +190,12 @@ fi
 %doc DOKUWIKI-SELINUX.README
 
 %changelog
-* Tue Apr 24 2012 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.10.20110525.a
-- Fix CVE-2012-2129
-- Fix Bugzilla bugs #815123
+* Thu Aug 02 2012 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.11.20120125.b
+- Latest upstream
+- Fix Bugzilla bugs #844726, #840255, #795487, #741384, #840686, #835145
+ 
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.10.20110525.a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Tue Jun 28 2011 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.9.20110525.a
 - Upgrade to latest upstream
diff --git a/sources b/sources
index 6c9f737..63e2944 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6452eff54afa35e031e15fec9a737dd1  dokuwiki-2011-05-25a.tgz
+6bceed04c3c38b3b251c70dfe2f9fca0  dokuwiki-2012-01-25b.tgz