[packages/dokuwiki] up to 2017-02-19b; use bundled packages
glen
glen at pld-linux.org
Tue Mar 28 21:45:36 CEST 2017
commit 73ba30352f4fd38046c5b6273c642f470081994e
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Mar 28 21:09:38 2017 +0300
up to 2017-02-19b; use bundled packages
dokuwiki-config.patch | 12 ++++++------
dokuwiki.spec | 50 ++++++++++++++++++++------------------------------
simplepie.patch | 11 -----------
system-jquery.patch | 15 ---------------
system-lessphp.patch | 6 +++---
system-phpseclib.patch | 14 --------------
6 files changed, 29 insertions(+), 79 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 6c76241..46fa610 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,4 +1,4 @@
-%define subver 2016-06-26a
+%define subver 2017-02-19b
%define ver %(echo %{subver} | tr -d -)
#define snap 1
#define rc_ 1
@@ -8,12 +8,12 @@ Summary: PHP-based Wiki webapplication
Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP
Name: dokuwiki
Version: %{ver}
-Release: 1
+Release: 0.1
License: GPL v2
Group: Applications/WWW
# Source0Download: http://download.dokuwiki.org/archive
Source0: http://download.dokuwiki.org/src/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: 9b9ad79421a1bdad9c133e859140f3f2
+# Source0-md5: ea11e4046319710a2bc6fdf58b5cda86
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Source3: http://glen.alkohol.ee/pld/jude.png
@@ -34,32 +34,23 @@ Source13: http://mirrors.jenkins-ci.org/art/jenkins-logo/16x16/headshot.png?/jen
# Source13-md5: ae892e4ca43ffab88f6e3dca951f3e8a
Patch66: %{name}-config.patch
Patch0: %{name}-paths.patch
-Patch1: system-jquery.patch
Patch2: style-width.patch
Patch4: %{name}-geshi.patch
Patch5: %{name}-http_auth-option.patch
Patch8: %{name}-notify-respect-minor.patch
Patch10: %{name}-mailtext.patch
Patch11: %{name}-notifyns.patch
-Patch15: simplepie.patch
Patch19: pld-branding.patch
Patch20: fixprivilegeescalationbug.diff
Patch21: task-1821.patch
Patch22: adldap.patch
Patch24: more-buttons.patch
-Patch25: system-phpseclib.patch
Patch26: system-lessphp.patch
Patch27: iconsizes-dump.patch
URL: https://www.dokuwiki.org/
BuildRequires: fslint
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.693
-Requires: jquery >= 1.8
-#Requires: jquery >= 1.9.1
-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)
@@ -139,20 +130,17 @@ test -e data/pages/playground/playground.txt || \
echo '====== PlayGround ======' > data/pages/playground/playground.txt
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch4 -p1
%patch5 -p1
%patch8 -p1
%patch10 -p1
%patch11 -p1
-%patch15 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch24 -p1
-%patch25 -p1
%patch26 -p1
%patch27 -p1
@@ -173,6 +161,9 @@ find -name _dummy | xargs %{__rm}
# source for security.png
%{__rm} data/security.xcf
+%{__rm} vendor/composer/installed.json
+%{__rm} lib/scripts/jquery/update.sh
+
# use system geshi package
%{__rm} -r vendor/easybook/geshi
rmdir vendor/easybook
@@ -181,29 +172,15 @@ rmdir vendor/easybook
%{__rm} -r lib/plugins/authad/adLDAP
# use system simplepie package
-%{__rm} inc/SimplePie.php
+#%{__rm} inc/SimplePie.php
# use system lessphp package
%{__rm} inc/lessc.inc.php
-# use system lib
-%{__rm} -r inc/phpseclib
-
# flash source on git tarballs
rm -rf lib/plugins/testing
rm -rf lib/plugins/*/_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.cookie.js
-%{__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
-
# pagetools - tools for development
%{__rm} -r lib/tpl/dokuwiki/images/pagetools
%{__rm} lib/tpl/dokuwiki/images/pagetools-build*
@@ -377,6 +354,7 @@ exit 0
%{_appdir}/inc/*.php
%{_appdir}/inc/preload.php.dist
%{_appdir}/inc/Form
+%{_appdir}/inc/Ui
%{_appdir}/inc/parser
# composer generated vendor autoload
@@ -386,9 +364,19 @@ exit 0
%{_appdir}/vendor/composer
# bundled packages
+# verbose files to detect new addons
%dir %{_appdir}/vendor/splitbrain
%{_appdir}/vendor/splitbrain/php-archive
+%dir %{_appdir}/vendor/paragonie
+%{_appdir}/vendor/paragonie/random_compat
+
+%dir %{_appdir}/vendor/phpseclib
+%{_appdir}/vendor/phpseclib/phpseclib
+
+%dir %{_appdir}/vendor/simplepie
+%{_appdir}/vendor/simplepie/simplepie
+
%dir %{_appdir}/lib
# allow plugins dir permission change to allow installation of plugins from admin
# however does not work with rpm 4.5
@@ -487,3 +475,5 @@ exit 0
%files setup
%defattr(644,root,root,755)
%{_appdir}/install.php
+
+
diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 9d1e92d..4a83cbc 100644
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -21,14 +21,14 @@
$conf['userewrite'] = 0; //this makes nice URLs: 0: off 1: .htaccess 2: internal
$conf['useslash'] = 0; //use slash instead of colon? only when rewrite is on
$conf['sepchar'] = '_'; //word separator character in page names; may be a
---- dokuwiki-2016-06-26a/install.php~ 2016-07-12 13:22:42.000000000 +0300
-+++ dokuwiki-2016-06-26a/install.php 2016-07-12 13:23:07.893243418 +0300
-@@ -61,7 +61,7 @@
- '2013-12-08' => '263c76af309fbf083867c18a34ff5214',
+--- dokuwiki-2017-02-19b/install.php~ 2017-03-28 20:41:51.000000000 +0300
++++ dokuwiki-2017-02-19b/install.php 2017-03-28 20:42:11.826302856 +0300
+@@ -63,7 +63,7 @@
'2014-05-05' => '263c76af309fbf083867c18a34ff5214',
'2015-08-10' => '263c76af309fbf083867c18a34ff5214',
-- '2016-06-26' => 'fd3abb6d89853dacb032907e619fbd73'
-+ '2016-06-26' => '9d9327f04a734885ebceb39b836fedf6',
+ '2016-06-26' => 'fd3abb6d89853dacb032907e619fbd73',
+- '2017-02-19' => 'e4f2f5a34c9dbcd96a5ecc8f2df25bd9'
++ '2017-02-19' => '4539002f3259ae01819a4ce1c2647a0c',
);
diff --git a/simplepie.patch b/simplepie.patch
deleted file mode 100644
index 659f330..0000000
--- a/simplepie.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dokuwiki-rc2010-10-07/inc/load.php~ 2010-10-07 21:36:43.000000000 +0300
-+++ dokuwiki-rc2010-10-07/inc/load.php 2010-10-07 21:37:38.245824556 +0300
-@@ -62,7 +62,7 @@
- 'Doku_Event_Handler' => DOKU_INC.'inc/events.php',
- 'EmailAddressValidator' => DOKU_INC.'inc/EmailAddressValidator.php',
- 'JpegMeta' => DOKU_INC.'inc/JpegMeta.php',
-- 'SimplePie' => DOKU_INC.'inc/SimplePie.php',
-+ 'SimplePie' => '/usr/share/php/simplepie.inc',
- 'FeedParser' => DOKU_INC.'inc/FeedParser.php',
- 'IXR_Server' => DOKU_INC.'inc/IXR_Library.php',
- 'IXR_Client' => DOKU_INC.'inc/IXR_Library.php',
diff --git a/system-jquery.patch b/system-jquery.patch
deleted file mode 100644
index 3ccb4fa..0000000
--- a/system-jquery.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- dokuwiki-2014-05-06/lib/exe/js.php~ 2014-05-06 15:09:52.000000000 +0300
-+++ dokuwiki-2014-05-06/lib/exe/js.php 2014-05-08 11:22:58.838818098 +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/jquery/jquery-migrate$min.js",
- DOKU_INC.'inc/lang/'.$conf['lang'].'/jquery.ui.datepicker.js',
- DOKU_INC."lib/scripts/fileuploader.js",
diff --git a/system-lessphp.patch b/system-lessphp.patch
index a412a29..e3df984 100644
--- a/system-lessphp.patch
+++ b/system-lessphp.patch
@@ -1,9 +1,9 @@
---- 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
+--- dokuwiki-2017-02-19b/inc/load.php~ 2017-03-28 20:41:05.000000000 +0300
++++ dokuwiki-2017-02-19b/inc/load.php 2017-03-28 20:41:30.364262022 +0300
@@ -83,7 +83,7 @@
+ 'RemoteAPI' => DOKU_INC.'inc/remote.php',
'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',
diff --git a/system-phpseclib.patch b/system-phpseclib.patch
deleted file mode 100644
index c653978..0000000
--- a/system-phpseclib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- dokuwiki-rc2013-10-28/inc/load.php~ 2013-11-13 23:16:52.413946070 +0200
-+++ dokuwiki-rc2013-10-28/inc/load.php 2013-11-13 23:26:34.714816053 +0200
-@@ -82,10 +82,7 @@
- 'RemoteAPI' => DOKU_INC.'inc/remote.php',
- 'RemoteAPICore' => DOKU_INC.'inc/RemoteAPICore.php',
- 'Subscription' => DOKU_INC.'inc/subscription.php',
-- 'Crypt_Base' => DOKU_INC.'inc/phpseclib/Crypt_Base.php',
-- 'Crypt_Rijndael' => DOKU_INC.'inc/phpseclib/Crypt_Rijndael.php',
-- 'Crypt_AES' => DOKU_INC.'inc/phpseclib/Crypt_AES.php',
-- 'Crypt_Hash' => DOKU_INC.'inc/phpseclib/Crypt_Hash.php',
-+ 'Crypt_AES' => '/usr/share/pear/Crypt/AES.php',
- 'lessc' => DOKU_INC.'inc/lessc.inc.php',
-
- 'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php',
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/aaf95edfb9edd06aeac43c1515657b9db1829bb3
More information about the pld-cvs-commit
mailing list