packages: dokuwiki/dokuwiki.spec, dokuwiki/system-jquery.patch (NEW)=?UTF-8?Q?=20?=- use ...

[glen]

Author: glen                         Date: Sun Jul  8 07:41:49 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system jquery packages

---- Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.107 -> 1.108) , system-jquery.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.107 packages/dokuwiki/dokuwiki.spec:1.108
--- packages/dokuwiki/dokuwiki.spec:1.107	Sun Jun 24 22:50:40 2012
+++ packages/dokuwiki/dokuwiki.spec	Sun Jul  8 09:41:44 2012
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	%{ver}
-Release:	1.5
+Release:	1.11
 License:	GPL v2
 Group:		Applications/WWW
 #Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -32,6 +32,7 @@
 # Source11-md5:	b1c999e6988440c9e2af6a12e9a56451
 Patch66:	%{name}-config.patch
 Patch0:		%{name}-paths.patch
+Patch1:		system-jquery.patch
 Patch3:		%{name}-config-allow-require.patch
 Patch4:		%{name}-geshi.patch
 Patch5:		%{name}-http_auth-option.patch
@@ -54,6 +55,9 @@
 BuildRequires:	fslint
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.520
+Requires:	jquery >= 1.6
+Requires:	jquery-cookie
+Requires:	jquery-ui
 Requires:	php-common >= 4:%{php_min_version}
 Requires:	php-geshi >= 1.0.7.19
 Requires:	php-session
@@ -80,7 +84,7 @@
 %define		find_lang 	%{_usrlibrpm}/dokuwiki-find-lang.sh %{buildroot}
 
 # bad depsolver
-%define		_noautopear	'pear(/usr/share/php/geshi.php)' 'pear(/usr/share/php/adLDAP.php)'
+%define		_noautopear	pear(/usr/share/php/geshi.php) pear(/usr/share/php/adLDAP.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
@@ -129,6 +133,7 @@
 touch data/pages/playground/playground.txt
 %endif
 %patch0 -p1
+%patch1 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -309,8 +314,8 @@
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/users.auth.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql.conf.php
 
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size mode) %{_sysconfdir}/local.php
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size mode) %{_sysconfdir}/plugins.local.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mode mtime size) %{_sysconfdir}/local.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mode mtime size) %{_sysconfdir}/plugins.local.php
 
 # use local.php, local.protected.php, etc for local changes
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/acronyms.conf
@@ -403,6 +408,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2012/07/08 07:41:44  glen
+- use system jquery packages
+
 Revision 1.107  2012/06/24 20:50:40  glen
 - up to 2012-06-24 snapshot
 

================================================================
Index: packages/dokuwiki/system-jquery.patch
diff -u /dev/null packages/dokuwiki/system-jquery.patch:1.1
--- /dev/null	Sun Jul  8 09:41:49 2012
+++ packages/dokuwiki/system-jquery.patch	Sun Jul  8 09:41:44 2012
@@ -0,0 +1,15 @@
+--- 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 @@
+ 
+     // array of core files
+     $files = array(
+-                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$min.js",
++                '/usr/share/jquery/cookie/cookie.js',
++                "/usr/share/jquery/ui/jquery-ui.js",
+                 DOKU_INC."lib/scripts/fileuploader.js",
+                 DOKU_INC."lib/scripts/fileuploaderextended.js",
+                 DOKU_INC.'lib/scripts/helpers.js',
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/dokuwiki/dokuwiki.spec?r1=1.107&r2=1.108