up to 2016-06-26a

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index d87641d9a75a714d37b0495f46e1d5f3ec252a3d..9d1e92d10b71647c783b1f0bde6a4bf2a66ac92e 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -21,14 +21,14 @@
  $conf['userewrite']  = 0;                //this makes nice URLs: 0: off 1: .htaccess 2: internal
  $conf['useslash']    = 0;                //use slash instead of colon? only when rewrite is on
  $conf['sepchar']     = '_';              //word separator character in page names; may be a
---- dokuwiki-2015-08-10/install.php~   2015-08-11 15:43:04.236120609 +0300
-+++ dokuwiki-2015-08-10/install.php    2015-08-11 15:43:07.236076584 +0300
-@@ -60,7 +60,7 @@
-     '2013-05-10'   => '7b62b75245f57f122d3e0f8ed7989623',
+--- dokuwiki-2016-06-26a/install.php~  2016-07-12 13:22:42.000000000 +0300
++++ dokuwiki-2016-06-26a/install.php   2016-07-12 13:23:07.893243418 +0300
+@@ -61,7 +61,7 @@
      '2013-12-08'   => '263c76af309fbf083867c18a34ff5214',
      '2014-05-05'   => '263c76af309fbf083867c18a34ff5214',
--    '2015-08-10'   => '263c76af309fbf083867c18a34ff5214'
-+    '2015-08-10'   => '5527d61a24b4feb0ade5a952848108fb'
+     '2015-08-10'   => '263c76af309fbf083867c18a34ff5214',
+-    '2016-06-26'   => 'fd3abb6d89853dacb032907e619fbd73'
++    '2016-06-26'   => '9d9327f04a734885ebceb39b836fedf6',
  );
  
  

diff --git a/dokuwiki-mailtext.patch b/dokuwiki-mailtext.patch
index eebfaa376bc48792b4d7f130f7f4f58d8c977c10..08ef4b633265a1a09da2079182eeaeba0d3d00b4 100644 (file)
--- a/dokuwiki-mailtext.patch
+++ b/dokuwiki-mailtext.patch
@@ -1,6 +1,6 @@
---- dokuwiki-2008-05-05/inc/lang/en/mailtext.txt       2008-08-18 21:01:33.357452202 +0300
-+++ dokuwiki-2009-12-25/inc/lang/en/mailtext.txt       2010-01-11 14:44:31.566667315 +0200
-@@ -1,17 +1,11 @@
+--- dokuwiki-2016-06-26a/inc/lang/en/mailtext.txt~     2016-07-03 19:08:51.000000000 +0300
++++ dokuwiki-2016-06-26a/inc/lang/en/mailtext.txt      2016-07-12 13:20:56.266379618 +0300
+@@ -1,12 +1,8 @@
 -A page in your DokuWiki was added or changed. Here are the details:
 -
 -Date        : @DATE@
@@ -11,15 +11,12 @@
 -New Revision: @NEWPAGE@
 -Edit Summary: @SUMMARY@
 -User        : @USER@
+-
 +@SUMMARY@
- 
++ 
 +--- @OLDPAGE@
 ++++ @NEWPAGE@
  @DIFF@
- 
--
++
 +Diff URL:
 +  @DIFFPAGE@
- -- 
- This mail was generated by DokuWiki at
- @DOKUWIKIURL@

diff --git a/dokuwiki.spec b/dokuwiki.spec
index f3e7841b87e71940ebe8ea0f24ba0e3ff696b416..6c76241608020bdc0477a419f74c0c1b9d6555f7 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,4 +1,4 @@
-%define                subver  2015-08-10a
+%define                subver  2016-06-26a
 %define                ver             %(echo %{subver} | tr -d -)
 #define                snap    1
 #define                rc_     1
@@ -8,12 +8,12 @@ Summary:      PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       3
+Release:       1
 License:       GPL v2
 Group:         Applications/WWW
 # Source0Download: http://download.dokuwiki.org/archive
 Source0:       http://download.dokuwiki.org/src/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: a4b8ae00ce94e42d4ef52dd8f4ad30fe
+# Source0-md5: 9b9ad79421a1bdad9c133e859140f3f2
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       http://glen.alkohol.ee/pld/jude.png
@@ -50,8 +50,6 @@ Patch24:      more-buttons.patch
 Patch25:       system-phpseclib.patch
 Patch26:       system-lessphp.patch
 Patch27:       iconsizes-dump.patch
-Patch28:       https://github.com/splitbrain/dokuwiki/pull/1418.patch
-# Patch28-md5: 54176dd1b3c70fc698abada5f6abc9a1
 URL:           https://www.dokuwiki.org/
 BuildRequires: fslint
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -157,7 +155,6 @@ echo '====== PlayGround ======' >  data/pages/playground/playground.txt
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
-%patch28 -p1
 
 %patch66 -p1
 
@@ -413,6 +410,11 @@ exit 0
 %{_appdir}/lib/plugins/authmysql/*.php
 %{_appdir}/lib/plugins/authmysql/*.txt
 %{_appdir}/lib/plugins/authmysql/conf
+%dir %{_appdir}/lib/plugins/authpdo
+%{_appdir}/lib/plugins/authpdo/*.php
+%{_appdir}/lib/plugins/authpdo/*.txt
+%{_appdir}/lib/plugins/authpdo/README
+%{_appdir}/lib/plugins/authpdo/conf
 %{_appdir}/lib/plugins/authpgsql/*.php
 %{_appdir}/lib/plugins/authpgsql/conf
 %{_appdir}/lib/plugins/authpgsql/*.txt