From d6f5edb44ea7868eada57ae169bf60e5eb450c26 Mon Sep 17 00:00:00 2001 From: Peter 'Pessoft' Kolínek Date: Jul 13 2018 19:36:47 +0000 Subject: Merge https://src.fedoraproject.org/rpms/dokuwiki --- diff --git a/dokuwiki.spec b/dokuwiki.spec index 643d70f..2f7f571 100644 --- a/dokuwiki.spec +++ b/dokuwiki.spec @@ -3,7 +3,7 @@ Name: dokuwiki Version: 0 -Release: 0.32.%{releasetag}%{?dist} +Release: 0.33.%{releasetag}%{?dist} Summary: Standards compliant simple to use wiki Group: Applications/Internet License: GPLv2 @@ -23,18 +23,18 @@ Requires: php-paragonie-random-compat Requires: php-phpseclib %description -DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating -documentation of any kind. It has a simple but powerful syntax which makes sure -the data-files remain readable outside the Wiki and eases the creation of -structured texts. +DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating +documentation of any kind. It has a simple but powerful syntax which makes sure +the data-files remain readable outside the Wiki and eases the creation of +structured texts. -All data is stored in plain text files no database is required. +All data is stored in plain text files no database is required. %package selinux Summary: SElinux support for dokuwiki Requires: %name = %version-%release Requires: policycoreutils -%if 0%{?rhel} > 5 || 0%{?fedora} +%if 0%{?rhel} > 5 || 0%{?fedora} Requires: python2-policycoreutils %endif Group: Applications/Internet @@ -167,7 +167,6 @@ fi %files -%defattr(-,root,root,-) %doc COPYING README VERSION mysql.conf.php.example %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %config(noreplace) %attr(0644,apache,apache) %{_sysconfdir}/%{name}/* @@ -203,17 +202,19 @@ fi %{_localstatedir}/lib/%{name}/data/pages/*/* %files selinux -%defattr(-,root,root,-) %doc DOKUWIKI-SELINUX.README %changelog -* Sun Jul 01 2018 Peter 'Pessoft' Kolínek - 0-0.32.20180422a +* Fri Jul 13 2018 Peter 'Pessoft' Kolínek - 0-0.33.20180422a - Update to the latest stable upstream 2018-04-22a "Greebo" (#1390291: CVE-2016-7964, CVE-2016-7965, CVE-2017-12583, CVE-2017-12979, CVE-2017-12980, CVE-2017-18123) - Fix missing vendor directory issue (#1372948) - Fix Apache config file for access to conf and bin - Replace more bundled code in vendor directory with Fedora packages (lesserphp, random_compat, phpseclib, simplepie) - Fix source to HTTPS +* Thu Jul 12 2018 Fedora Release Engineering - 0-0.32.20150810a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Mar 30 2018 Iryna Shcherbina - 0-0.31.20150810a - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) @@ -278,7 +279,7 @@ fi * Thu Aug 02 2012 Andrew Colin Kissa - 0-0.13.20120125.b - Latest upstream - Fix Bugzilla bugs #844726, #840255, #795487, #741384, #840686, #835145 - + * Wed Jul 18 2012 Fedora Release Engineering - 0-0.12.20110525.a - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild