[dokuwiki] Update to the latest upstream + some bugfixes

[Adam Tkac]

commit 6549321a5005682d9b50cab2bf52f068bf645121
Author: Adam Tkac <adam.tkac at gooddata.com>
Date:   Fri Dec 26 15:40:46 2014 +0100

    Update to the latest upstream + some bugfixes
    
    - drop requirement of httpd (#1164396)
    - fix SELinux file contexts (#1064524)
    - require php-xml (#1061477)
    
    Signed-off-by: Adam Tkac <vonsch at gmail.com>

 .gitignore    |    1 +
 dokuwiki.spec |   24 ++++++++++++++----------
 sources       |    2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2602bc2..9d78faa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ dokuwiki-2009-12-25c.tgz
 /dokuwiki-2012-10-13.tgz
 /dokuwiki-2013-05-10a.tgz
 /dokuwiki-2013-12-08.tgz
+/dokuwiki-2014-09-29b.tgz
diff --git a/dokuwiki.spec b/dokuwiki.spec
index abbdd88..2df6647 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,9 +1,9 @@
-%global		releasenum 2013-12-08
-%global		releasetag 20131208
+%global		releasenum 2014-09-29b
+%global		releasetag 20140929b
 
 Name:		dokuwiki
 Version:	0
-Release:	0.22.%{releasetag}%{?dist}
+Release:	0.23.%{releasetag}%{?dist}
 Summary:	Standards compliant simple to use wiki
 Group:		Applications/Internet
 License:	GPLv2
@@ -17,7 +17,7 @@ Requires:	php-gd
 Requires:	php-geshi
 #Requires:	php-simplepie
 Requires:	php-email-address-validation
-Requires:	httpd
+Requires:	php-xml
 
 %description
 DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating 
@@ -152,18 +152,17 @@ popd
 rm -rf $RPM_BUILD_ROOT
 
 %post selinux
-semanage fcontext -a -t httpd_sys_content_rw_t '%{_sysconfdir}/%{name}(/.*)?' 2>/dev/null || :
+semanage fcontext -a -t httpd_sys_rw_content_t '%{_sysconfdir}/%{name}(/.*)?' 2>/dev/null || :
 semanage fcontext -a -t httpd_sys_content_t '%{_datadir}/%{name}(/.*)?' 2>/dev/null || :
-semanage fcontext -a -t httpd_sys_content_rw_t '%{_datadir}/%{name}/lib/plugins(/.*)?' 2>/dev/null || :
+semanage fcontext -a -t httpd_sys_rw_content_t '%{_datadir}/%{name}/lib/plugins(/.*)?' 2>/dev/null || :
 restorecon -R '%{_sysconfdir}/%{name}' || :
 restorecon -R '%{_datadir}/%{name}' || :
-restorecon -R '%{_datadir}/%{name}/lib/plugins' || :
 
 %postun selinux
 if [ $1 -eq 0 ] ; then
-semanage fcontext -d -t httpd_sys_content_rw_t '%{_sysconfdir}/%{name}(/.*)?' 2>/dev/null || :
+semanage fcontext -d -t httpd_sys_rw_content_t '%{_sysconfdir}/%{name}(/.*)?' 2>/dev/null || :
 semanage fcontext -d -t httpd_sys_content_t '%{_datadir}/%{name}(/.*)?' 2>/dev/null || :
-semanage fcontext -d -t httpd_sys_content_rw_t '%{_datadir}/%{name}/lib/plugins(/.*)?' 2>/dev/null || :
+semanage fcontext -d -t httpd_sys_rw_content_t '%{_datadir}/%{name}/lib/plugins(/.*)?' 2>/dev/null || :
 fi
 
 
@@ -200,7 +199,6 @@ fi
 %attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/media_attic
 %attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/media_meta
 %attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages
-%attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/playground
 %attr(0755,apache,apache) %dir %{_localstatedir}/lib/%{name}/data/pages/wiki
 %{_localstatedir}/lib/%{name}/data/pages/*/*
 
@@ -209,6 +207,12 @@ fi
 %doc DOKUWIKI-SELINUX.README
 
 %changelog
+* Fri Dec 26 2014 Adam Tkac <vonsch at gmail.com> - 0.0.23.20140929b
+- update to the latest upstream
+- drop requirement of httpd (#1164396)
+- fix SELinux file contexts (#1064524)
+- require php-xml (#1061477)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.22.20131208
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index dfa7161..5f35f10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-620b7fed511e643ad05ad13207baa502  dokuwiki-2013-12-08.tgz
+605b14aad2f85f2f6a66ccb7c0a494e9  dokuwiki-2014-09-29b.tgz