[dokuwiki/f17] * fix merge errors

[topdog]

commit 9ff03df002c9f9ef85aac047c6db7ec118745ed1
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date:   Sat Oct 20 15:31:52 2012 +0200

    * fix merge errors

 .gitignore                     |    8 +-------
 dokuwiki-rm-bundled-libs.patch |    7 -------
 dokuwiki.spec                  |   21 ---------------------
 sources                        |    4 ----
 4 files changed, 1 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 58b844c..3ae93cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1 @@
-dokuwiki-2009-12-25c.tgz
-/dokuwiki-2011-05-25a.tgz
-/dokuwiki-2012-01-25b.tgz
-<<<<<<< HEAD
-=======
-/dokuwiki-2012-10-13.tgz
->>>>>>> master
+dokuwiki-2012-10-13.tgz
diff --git a/dokuwiki-rm-bundled-libs.patch b/dokuwiki-rm-bundled-libs.patch
index 54dbe02..097892a 100644
--- a/dokuwiki-rm-bundled-libs.patch
+++ b/dokuwiki-rm-bundled-libs.patch
@@ -62975,17 +62975,10 @@ diff -ruN dokuwiki-2012-10-13.orig/inc/load.php dokuwiki-2012-10-13/inc/load.php
          '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 && !$INPUT->bool('purge') &&
diff --git a/dokuwiki.spec b/dokuwiki.spec
index d99ed4d..9ba91ee 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,22 +1,13 @@
 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
@@ -43,13 +34,8 @@ BuildArch:	noarch
 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}
 
@@ -204,12 +190,6 @@ fi
 %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
@@ -221,7 +201,6 @@ fi
 * 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 --git a/sources b/sources
index e305e5a..d41dfc7 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-6bceed04c3c38b3b251c70dfe2f9fca0  dokuwiki-2012-01-25b.tgz
-=======
 a910ebb2fcca13c0337ed672304c4ad4  dokuwiki-2012-10-13.tgz
->>>>>>> master