[packages/dokuwiki: 2/8] use system phpseclib

glen glen at pld-linux.org
Thu Dec 19 11:02:30 CET 2013


commit fff14908dc5907935fa3e1abc136f4e034e3a226
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Nov 13 23:30:06 2013 +0200

    use system phpseclib

 dokuwiki.spec | 6 ++++++
 1 file changed, 6 insertions(+)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index b9263cb..1d696ac 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -47,6 +47,7 @@ Patch20:	fixprivilegeescalationbug.diff
 Patch21:	task-1821.patch
 Patch22:	adldap.patch
 Patch24:	more-buttons.patch
+Patch25:	system-phpseclib.patch
 URL:		https://www.dokuwiki.org/
 BuildRequires:	fslint
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
@@ -61,6 +62,7 @@ Requires:	php(core) >= %{php_min_version}
 Requires:	php(session)
 Requires:	php(xml)
 Requires:	php-geshi >= 1.0.7.19
+Requires:	php-seclib
 Requires:	php-simplepie >= 1.0.1
 Requires:	webapps
 Requires:	webserver(access)
@@ -149,6 +151,7 @@ touch data/pages/playground/playground.txt
 %patch21 -p1
 %patch22 -p1
 %patch24 -p1
+%patch25 -p1
 
 %patch66 -p1
 
@@ -177,6 +180,9 @@ find -name _dummy | xargs %{__rm}
 # use system simplepie package
 %{__rm} inc/SimplePie.php
 
+# use system lib
+%{__rm} -r inc/phpseclib
+
 # flash source on git tarballs
 rm -rf lib/_fla
 rm -rf lib/plugins/testing
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/79207c2d683efc1381ba2134b3024721845b1ffd



More information about the pld-cvs-commit mailing list