Author: glen Date: Mon Jan 11 12:49:57 2010 GMT Module: packages Tag: HEAD ---- Log message: - use system adldap package
---- Files affected: packages/dokuwiki: dokuwiki.spec (1.69 -> 1.70) , adldap.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/dokuwiki/dokuwiki.spec diff -u packages/dokuwiki/dokuwiki.spec:1.69 packages/dokuwiki/dokuwiki.spec:1.70 --- packages/dokuwiki/dokuwiki.spec:1.69 Mon Jan 11 13:37:10 2010 +++ packages/dokuwiki/dokuwiki.spec Mon Jan 11 13:49:52 2010 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# TODO -# - external: http://adldap.sourceforge.net/ %define subver 2009-12-25 %define ver %(echo %{subver} | tr -d -) %define php_min_version 5.1.2 @@ -9,7 +7,7 @@ Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP Name: dokuwiki Version: %{ver} -Release: 0.16 +Release: 0.18 License: GPL v2 Group: Applications/WWW Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz @@ -43,6 +41,7 @@ Patch19: pld-branding.patch Patch20: fixprivilegeescalationbug.diff Patch21: task-1821.patch +Patch22: adldap.patch URL: http://www.dokuwiki.org/dokuwiki BuildRequires: rpm-php-pearprov >= 4.4.2-11 BuildRequires: rpmbuild(macros) >= 1.520 @@ -54,6 +53,7 @@ Requires: webserver(access) Requires: webserver(alias) Requires: webserver(php) +Suggests: php-adldap >= 3.3.1 Suggests: php-gd # can use gz compression to store attic pages Suggests: php-zlib @@ -132,6 +132,7 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 %patch66 -p1 @@ -145,6 +146,9 @@ rm -f inc/geshi.php rm -rf inc/geshi +# use system adldap package +rm -f inc/adLDAP.php + # use system simplepie package rm -f inc/SimplePie.php @@ -356,6 +360,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.70 2010/01/11 12:49:52 glen +- use system adldap package + Revision 1.69 2010/01/11 12:37:10 glen - add $r1, $r2 GET params support in diff action ================================================================ Index: packages/dokuwiki/adldap.patch diff -u /dev/null packages/dokuwiki/adldap.patch:1.1 --- /dev/null Mon Jan 11 13:49:58 2010 +++ packages/dokuwiki/adldap.patch Mon Jan 11 13:49:52 2010 @@ -0,0 +1,11 @@ +--- dokuwiki-2009-12-25/inc/auth/ad.class.php~ 2009-12-25 12:14:41.000000000 +0200 ++++ dokuwiki-2009-12-25/inc/auth/ad.class.php 2010-01-11 14:46:38.446655609 +0200 +@@ -32,7 +32,7 @@ + * @author Andreas Gohr <a...@splitbrain.org> + */ + +-require_once(DOKU_INC.'inc/adLDAP.php'); ++require_once 'adLDAP.php'; + + class auth_ad extends auth_basic { + var $cnf = null; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.69&r2=1.70&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit