use bundled adLDAP package

diff --git a/adldap.patch b/adldap.patch
deleted file mode 100644 (file)
index a1213a5..0000000
--- a/adldap.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- dokuwiki-2015-08-10/./lib/plugins/authad/auth.php~ 2015-08-10 11:06:28.000000000 +0300
-+++ dokuwiki-2015-08-10/./lib/plugins/authad/auth.php  2015-08-11 15:26:57.947057496 +0300
-@@ -2,8 +2,8 @@
- // must be run within Dokuwiki
- if(!defined('DOKU_INC')) die();
- 
--require_once(DOKU_PLUGIN.'authad/adLDAP/adLDAP.php');
--require_once(DOKU_PLUGIN.'authad/adLDAP/classes/adLDAPUtils.php');
-+require_once '/usr/share/php/adLDAP/adLDAP.php';
-+require_once '/usr/share/php/adLDAP/classes/adLDAPUtils.php';
- 
- /**
-  * Active Directory authentication backend for DokuWiki

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 46fa610111373cb4b8a6fa0e9bfb98b3f89fdbaf..d16b7fb2c911b40d3939923b2c6c7fa8abf1252e 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -8,7 +8,7 @@ Summary:        PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       0.1
+Release:       0.2
 License:       GPL v2
 Group:         Applications/WWW
 # Source0Download: http://download.dokuwiki.org/archive
@@ -43,7 +43,6 @@ Patch11:      %{name}-notifyns.patch
 Patch19:       pld-branding.patch
 Patch20:       fixprivilegeescalationbug.diff
 Patch21:       task-1821.patch
-Patch22:       adldap.patch
 Patch24:       more-buttons.patch
 Patch26:       system-lessphp.patch
 Patch27:       iconsizes-dump.patch
@@ -63,7 +62,6 @@ Requires:     webserver(access)
 Requires:      webserver(alias)
 Requires:      webserver(php)
 Suggests:      php(gd)
-Suggests:      php-adldap >= 4.0.4
 Obsoletes:     dokuwiki-plugin-jquery
 Conflicts:     dokuwiki-plugin-icalevents < 20120909
 # can use gz compression to store attic pages
@@ -79,7 +77,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _cachedir               /var/cache/%{name}
 %define                find_lang       %{_usrlibrpm}/dokuwiki-find-lang.sh %{buildroot}
 
-%define                _noautoreq_pear /usr/share/php/geshi.php /usr/share/php/adLDAP/.*
+%define                _noautoreq_pear /usr/share/php/geshi.php
 
 # exclude optional php dependencies
 %define                _noautophp      php-bzip2 php-bcmath php-zip php-date php-ftp php-hash php-ldap php-mbstring php-mysql php-pgsql php-tokenizer
@@ -139,7 +137,6 @@ echo '====== PlayGround ======' >  data/pages/playground/playground.txt
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
 %patch24 -p1
 %patch26 -p1
 %patch27 -p1
@@ -168,9 +165,6 @@ find -name _dummy | xargs %{__rm}
 %{__rm} -r vendor/easybook/geshi
 rmdir vendor/easybook
 
-# use system adldap package
-%{__rm} -r lib/plugins/authad/adLDAP
-
 # use system simplepie package
 #%{__rm} inc/SimplePie.php
 
@@ -389,6 +383,7 @@ exit 0
 %dir %{_appdir}/lib/plugins/authad
 %{_appdir}/lib/plugins/authad/*.php
 %{_appdir}/lib/plugins/authad/*.txt
+%{_appdir}/lib/plugins/authad/adLDAP
 %{_appdir}/lib/plugins/authad/conf
 %dir %{_appdir}/lib/plugins/authldap
 %{_appdir}/lib/plugins/authldap/*.php