use system jquery, current 1.8, not 1.9 version

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 187e7250fc30e517d9404208f41dd434892a5e9a..691f4569120e2161cff59dbdb2044beb81b0433b 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.5
+Release:       0.8
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -52,9 +52,12 @@ URL:         https://www.dokuwiki.org/
 BuildRequires: fslint
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.520
-#Requires:     jquery >= 1.9
+Requires:      jquery >= 1.8
+#Requires:     jquery >= 1.9.1
 Requires:      jquery-cookie
-Requires:      jquery-ui
+#Requires:     jquery-migrate
+#Requires:     jquery-ui >= 1.10.2
+Requires:      jquery-ui >= 1.8
 Requires:      php(core) >= %{php_min_version}
 Requires:      php(session)
 Requires:      php(xml)
@@ -158,7 +161,7 @@ mv conf/users.auth.php{.dist,}
 mv conf/mysql.conf.php{.example,}
 
 find -name _dummy | xargs rm
-%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html inc/lang/.htaccess
+%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html inc/lang/.htaccess conf/.htaccess
 
 # we just don't package deleted files, these get removed automatically on rpm upgrades
 %{__rm} data/deleted.files
@@ -182,12 +185,14 @@ rm -rf lib/plugins/config/_test
 
 # use system packages
 %{__rm} lib/scripts/jquery/update.sh
-#%{__rm} lib/scripts/jquery/jquery-ui.js
-#%{__rm} lib/scripts/jquery/jquery-ui.min.js
+%{__rm} lib/scripts/jquery/jquery-ui.js
+%{__rm} lib/scripts/jquery/jquery-ui.min.js
 %{__rm} lib/scripts/jquery/jquery.cookie.js
-#%{__rm} lib/scripts/jquery/jquery.js
-#%{__rm} lib/scripts/jquery/jquery.min.js
-#%{__rm} -r lib/scripts/jquery/jquery-ui-theme
+%{__rm} lib/scripts/jquery/jquery.js
+%{__rm} lib/scripts/jquery/jquery.min.js
+%{__rm} lib/scripts/jquery/jquery-migrate.js
+%{__rm} lib/scripts/jquery/jquery-migrate.min.js
+%{__rm} -r lib/scripts/jquery/jquery-ui-theme
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f

diff --git a/system-jquery.patch b/system-jquery.patch
index 6b9a0948cf54f6e9a5f2291a7f8453f657974df0..4cf4f109da6a8b427b568c7970d0236173981395 100644 (file)
--- a/system-jquery.patch
+++ b/system-jquery.patch
@@ -1,13 +1,16 @@
---- 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 @@
+--- dokuwiki-2013-05-10/lib/exe/js.php 2013-05-28 11:51:39.656021911 +0300
++++ dokuwiki-2013-05-10/lib/exe/js.php 2013-05-28 16:22:44.737594377 +0300
+@@ -40,10 +40,9 @@
+ 
      // 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",
+-                DOKU_INC."lib/scripts/jquery/jquery-migrate$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/jquery/jquery-migrate$min.js",
                  DOKU_INC."lib/scripts/fileuploader.js",
                  DOKU_INC."lib/scripts/fileuploaderextended.js",
+                 DOKU_INC.'lib/scripts/helpers.js',