[packages/dokuwiki: 4/8] use system lessphp
glen
glen at pld-linux.org
Thu Dec 19 11:02:40 CET 2013
commit 9e71cc6a6f4a4ee24b80928edc0c0fabf7b4520a
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Nov 14 20:39:02 2013 +0200
use system lessphp
dokuwiki.spec | 8 +++++++-
system-lessphp.patch | 11 +++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 903ca30..0bbca9f 100644
--- 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
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',
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/79207c2d683efc1381ba2134b3024721845b1ffd
More information about the pld-cvs-commit
mailing list