From 5089b23b8df6311663073aaa2184868c56877bbb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 7 Mar 2013 14:46:49 +0200 Subject: [PATCH] up to 2013-03-06 RC1 Weatherwax --- adldap.patch | 16 ++++++++-------- dokuwiki-config.patch | 12 ++++++------ dokuwiki.spec | 28 +++++++++++++++++++--------- system-jquery.patch | 14 ++++++-------- 4 files changed, 39 insertions(+), 31 deletions(-) diff --git a/adldap.patch b/adldap.patch index e1bd83c..73b20a9 100644 --- a/adldap.patch +++ b/adldap.patch @@ -1,11 +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 - */ +--- dokuwiki-2013-03-05/./lib/plugins/authad/auth.php~ 2013-03-03 21:16:43.000000000 +0200 ++++ dokuwiki-2013-03-05/./lib/plugins/authad/auth.php 2013-03-05 12:41:35.995501610 +0200 +@@ -2,7 +2,7 @@ + // must be run within Dokuwiki + if(!defined('DOKU_INC')) die(); --require_once(DOKU_INC.'inc/adLDAP.php'); +-require_once(DOKU_PLUGIN.'authad/adLDAP/adLDAP.php'); +require_once '/usr/share/php/adLDAP.php'; - class auth_ad extends auth_basic { - var $cnf = null; + /** + * Active Directory authentication backend for DokuWiki diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch index 1da0444..61b1555 100644 --- 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-2012-09-10/install.php~ 2012-09-10 18:03:15.000000000 +0300 -+++ dokuwiki-2012-09-10/install.php 2012-09-10 18:03:48.869223181 +0300 -@@ -56,7 +56,7 @@ - '2011-05-25' => '4241865472edb6fa14a1227721008072', +--- dokuwiki-rc2013-03-06/install.php~ 2013-03-06 19:59:27.000000000 +0200 ++++ dokuwiki-rc2013-03-06/install.php 2013-03-06 20:05:08.848230442 +0200 +@@ -57,7 +57,7 @@ '2011-11-10' => 'b46ff19a7587966ac4df61cbab1b8b31', '2012-01-25' => '72c083c73608fc43c586901fd5dabb74', -- '2012-09-10' => 'eb0b3fc90056fbc12bac6f49f7764df3' -+ '2012-09-10' => '465c1415bfcc2865aab936d54b35307c' + '2012-09-10' => 'eb0b3fc90056fbc12bac6f49f7764df3', +- '2013-04-06' => '7b62b75245f57f122d3e0f8ed7989623', ++ '2013-04-06' => 'asdf', ); diff --git a/dokuwiki.spec b/dokuwiki.spec index 4e609ce..a413588 100644 --- a/dokuwiki.spec +++ b/dokuwiki.spec @@ -1,18 +1,20 @@ -%define subver 2013-02-01 +%define subver 2013-03-06 %define ver %(echo %{subver} | tr -d -) -%define snap 1 +#define snap 1 +%define rc_ 1 %define php_min_version 5.2.4 %include /usr/lib/rpm/macros.php Summary: PHP-based Wiki webapplication Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP Name: dokuwiki Version: %{ver} -Release: 0.2 +Release: 0.3 License: GPL v2 Group: Applications/WWW #Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz -Source0: http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz -# Source0-md5: 639847b28f8547c73179fb5846193890 +Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz +# Source0-md5: a7a290858cb0c624ab83a894417b6686 +#Source0: http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz Source1: %{name}-apache.conf Source2: %{name}-lighttpd.conf Source3: http://glen.alkohol.ee/pld/jude.png @@ -50,7 +52,7 @@ URL: https://www.dokuwiki.org/ BuildRequires: fslint BuildRequires: rpm-php-pearprov >= 4.4.2-11 BuildRequires: rpmbuild(macros) >= 1.520 -Requires: jquery >= 1.6 +#Requires: jquery >= 1.9 Requires: jquery-cookie Requires: jquery-ui Requires: php(core) >= %{php_min_version} @@ -121,7 +123,7 @@ po pierwszej instalacji. Potem należy go odinstalować, jako że pozostawienie plików instalacyjnych mogłoby być niebezpieczne. %prep -%setup -q -n %{name}-%{subver} %{?snap:-c} +%setup -q -n %{name}-%{?rc_:rc}%{subver} %{?snap:-c} %if 0%{?snap:1} mv *-dokuwiki-*/* . test -e VERSION || echo %{subver}-git > VERSION @@ -168,7 +170,7 @@ find -name _dummy | xargs rm %{__rm} -r inc/geshi # use system adldap package -%{__rm} inc/adLDAP.php +%{__rm} -r lib/plugins/authad/adLDAP # use system simplepie package %{__rm} inc/SimplePie.php @@ -176,6 +178,7 @@ find -name _dummy | xargs rm # flash source on git tarballs rm -rf lib/_fla rm -rf lib/plugins/testing +rm -rf lib/plugins/config/_test # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -338,7 +341,6 @@ exit 0 %dir %{_appdir}/inc %{_appdir}/inc/*.php %{_appdir}/inc/preload.php.dist -%{_appdir}/inc/auth %{_appdir}/inc/parser %dir %{_appdir}/lib @@ -367,6 +369,14 @@ exit 0 %dir %{_appdir}/lib/plugins/popularity %{_appdir}/lib/plugins/popularity/*.* %{_appdir}/lib/plugins/*.php + + +%{_appdir}/lib/plugins/authad +%{_appdir}/lib/plugins/authldap +%{_appdir}/lib/plugins/authmysql +%{_appdir}/lib/plugins/authpgsql +%{_appdir}/lib/plugins/authplain + %{_appdir}/lib/images %{_appdir}/lib/scripts %{_appdir}/lib/styles diff --git a/system-jquery.patch b/system-jquery.patch index e97a5d0..6b9a094 100644 --- a/system-jquery.patch +++ b/system-jquery.patch @@ -1,15 +1,13 @@ ---- dokuwiki-2012-01-25a/lib/exe/js.php 2012-04-19 13:09:54.000000000 +0300 -+++ ./lib/exe/js.php 2012-05-05 15:29:01.000000000 +0300 -@@ -40,9 +40,9 @@ - +--- dokuwiki-2013-03-05/lib/exe/js.php~ 2013-03-03 21:16:43.000000000 +0200 ++++ dokuwiki-2013-03-05/lib/exe/js.php 2013-03-05 12:40:14.025436522 +0200 +@@ -41,8 +41,8 @@ // array of core files $files = array( -- DOKU_INC."lib/scripts/jquery/jquery$min.js", + DOKU_INC."lib/scripts/jquery/jquery$min.js", - DOKU_INC.'lib/scripts/jquery/jquery.cookie.js', - DOKU_INC."lib/scripts/jquery/jquery-ui$min.js", -+ "/usr/share/jquery/jquery.js", + '/usr/share/jquery/cookie/cookie.js', -+ "/usr/share/jquery/ui/jquery-ui.js", ++ '/usr/share/jquery/ui/jquery-ui.js', + DOKU_INC."lib/scripts/jquery/jquery-migrate$min.js", DOKU_INC."lib/scripts/fileuploader.js", DOKU_INC."lib/scripts/fileuploaderextended.js", - DOKU_INC.'lib/scripts/helpers.js', -- 2.44.0