use system lessphp

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 903ca30d27b3318aa82a565203b00a507bafc013..0bbca9f62d3c02d4cf25006ee424501ae661e876 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
 #Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -48,6 +48,7 @@ Patch21:      task-1821.patch
 Patch22:       adldap.patch
 Patch24:       more-buttons.patch
 Patch25:       system-phpseclib.patch
+Patch26:       system-lessphp.patch
 URL:           https://www.dokuwiki.org/
 BuildRequires: fslint
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -58,6 +59,7 @@ Requires:     jquery-cookie
 #Requires:     jquery-migrate
 #Requires:     jquery-ui >= 1.10.2
 Requires:      jquery-ui >= 1.8
+Requires:      lessphp >= 0.3.9
 Requires:      php(core) >= %{php_min_version}
 Requires:      php(session)
 Requires:      php(xml)
@@ -152,6 +154,7 @@ touch data/pages/playground/playground.txt
 %patch22 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
 
 %patch66 -p1
 
@@ -180,6 +183,9 @@ find -name _dummy | xargs %{__rm}
 # use system simplepie package
 %{__rm} inc/SimplePie.php
 
+# use system lessphp package
+%{__rm} inc/lessc.inc.php
+
 # use system lib
 %{__rm} -r inc/phpseclib
 

diff --git a/system-lessphp.patch b/system-lessphp.patch
new file mode 100644 (file)
index 0000000..a412a29
--- /dev/null
+++ b/system-lessphp.patch
@@ -0,0 +1,11 @@
+--- dokuwiki-rc2013-10-28/inc/load.php~        2013-11-13 23:27:34.370547242 +0200
++++ dokuwiki-rc2013-10-28/inc/load.php 2013-11-14 20:18:16.051225452 +0200
+@@ -83,7 +83,7 @@
+         'RemoteAPICore'         => DOKU_INC.'inc/RemoteAPICore.php',
+         'Subscription'          => DOKU_INC.'inc/subscription.php',
+         'Crypt_AES'             => '/usr/share/pear/Crypt/AES.php',
+-        'lessc'                 => DOKU_INC.'inc/lessc.inc.php',
++        'lessc'                 => '/usr/share/php/lessc.inc.php',
+ 
+         'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php',
+         'DokuWiki_Admin_Plugin'  => DOKU_PLUGIN.'admin.php',