[packages/ckfinder] up to 2.4
glen
glen at pld-linux.org
Mon Dec 16 12:31:14 CET 2013
commit 66d1805bed1c2ebe23d47be82097fed91c648fc5
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Dec 16 13:30:33 2013 +0200
up to 2.4
ckfinder.spec | 84 +++++++++++++++++++++++++++++----------------------
config.patch | 21 ++++---------
error_reporting.patch | 15 ---------
paths.patch | 37 +++++++++++------------
4 files changed, 71 insertions(+), 86 deletions(-)
---
diff --git a/ckfinder.spec b/ckfinder.spec
index 4312e35..94f038f 100644
--- a/ckfinder.spec
+++ b/ckfinder.spec
@@ -1,14 +1,13 @@
-Summary: AJAX file manager for web browsers
+Summary: CKFinder - Web File Manager
Summary(pl.UTF-8): Edytor tekstowy dla Internetu
Name: ckfinder
-Version: 1.4.2
-Release: 4
+Version: 2.4
+Release: 1
License: Custom
Group: Applications/WWW
Source0: http://download.cksource.com/CKFinder/CKFinder%20for%20PHP/%{version}/%{name}_php_%{version}.tar.gz
-# Source0-md5: 0f37b528272f915b9fcd3a12e2f53439
-URL: http://www.ckfinder.com/
-Patch0: error_reporting.patch
+# Source0-md5: d29d9a11ec47bf639c32263503601255
+URL: http://www.cksource.com/ckfinder
Patch1: paths.patch
Patch2: config.patch
Source1: find-lang.sh
@@ -64,20 +63,21 @@ Interfejs zarządcy plików do PHP.
# use versioned build dir
mv ckfinder/* .
rmdir ckfinder
+%undos -f js,css,txt,html,php
+
+mv lang/_translationstatus.txt .
+
+# don't package
+mv plugins/dummy .
# force php5 only
-rm core/ckfinder_php4.php
mv core/ckfinder_php5.php ckfinder.php
-rm -r core/connector/php/php4
mv core/connector/php/php5/* core/connector/php
rmdir core/connector/php/php5
# kill core/ in path
-%{__grep} -r core/ . -l | xargs %{__sed} -i -e 's,core/,,g'
+#%{__grep} -r core/ . -l | xargs %{__sed} -i -e 's,core/,,g'
-%undos -f js,css,txt,html,php
-
-%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -85,11 +85,14 @@ rmdir core/connector/php/php5
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},%{php_data_dir},/var/lib/%{name}}
-cp -a ckfinder.js $RPM_BUILD_ROOT%{_appdir}
-cp -a core/* $RPM_BUILD_ROOT%{_appdir}
-cp -a ckfinder.html $RPM_BUILD_ROOT%{_appdir}
-cp -a config.php $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a ckfinder.php $RPM_BUILD_ROOT%{php_data_dir}
+cp -p ckfinder.js $RPM_BUILD_ROOT%{_appdir}
+cp -p ckfinder_v1.js $RPM_BUILD_ROOT%{_appdir}
+cp -p ckfinder.html $RPM_BUILD_ROOT%{_appdir}
+cp -p ckfinder.php $RPM_BUILD_ROOT%{php_data_dir}
+cp -p config.php $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p config.js $RPM_BUILD_ROOT%{_sysconfdir}
+
+cp -a core help lang plugins skins $RPM_BUILD_ROOT%{_appdir}
cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
@@ -123,31 +126,39 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc changelog.txt install.txt license.txt
+%doc changelog.txt install.txt license.txt translations.txt
%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.js
%dir %{_appdir}
-%dir %{_appdir}/connector
-%dir %{_appdir}/help
-%dir %{_appdir}/skins
%{_appdir}/ckfinder.js
+%{_appdir}/ckfinder_v1.js
%{_appdir}/ckfinder.html
-%{_appdir}/css
-%{_appdir}/images
-%{_appdir}/js
-%{_appdir}/pages
-%{_appdir}/skins/default
-%{_appdir}/skins/office2003
-%{_appdir}/skins/silver
+%dir %{_appdir}/plugins
+%{_appdir}/plugins/fileeditor
+%{_appdir}/plugins/flashupload
+%{_appdir}/plugins/gallery
+%{_appdir}/plugins/imageresize
+%{_appdir}/plugins/watermark
+%{_appdir}/plugins/zip
+
+%dir %{_appdir}/skins
+%{_appdir}/skins/kama
+%{_appdir}/skins/v1
+%dir %{_appdir}/help
%{_appdir}/help/en
-%lang(es_MX) %{_appdir}/help/es-mx
+%{_appdir}/help/files
+%lang(cs) %{_appdir}/help/cs
%lang(es) %{_appdir}/help/es
+%lang(es_MX) %{_appdir}/help/es-mx
+%lang(fi) %{_appdir}/help/fi
+%lang(lt) %{_appdir}/help/lt
%lang(pl) %{_appdir}/help/pl
%dir %attr(770,root,http) /var/lib/%{name}
@@ -156,13 +167,14 @@ rm -rf $RPM_BUILD_ROOT
%files connector-php
%defattr(644,root,root,755)
-%dir %{_appdir}/connector/php
-%{_appdir}/connector/php/connector.php
-%{_appdir}/connector/php/constants.php
-%{_appdir}/connector/php/CommandHandler
-%{_appdir}/connector/php/Core
-%{_appdir}/connector/php/ErrorHandler
-%{_appdir}/connector/php/Utils
+%dir %{_appdir}/core
+%dir %{_appdir}/core/connector/php
+%{_appdir}/core/connector/php/connector.php
+%{_appdir}/core/connector/php/constants.php
+%{_appdir}/core/connector/php/CommandHandler
+%{_appdir}/core/connector/php/Core
+%{_appdir}/core/connector/php/ErrorHandler
+%{_appdir}/core/connector/php/Utils
%files -n php-%{name}
%defattr(644,root,root,755)
diff --git a/config.patch b/config.patch
index 49345d6..7181c4b 100644
--- a/config.patch
+++ b/config.patch
@@ -1,18 +1,9 @@
---- ckfinder-1.4.2/./config.php~ 2010-05-27 00:51:09.000000000 +0300
-+++ ckfinder-1.4.2/./config.php 2010-05-27 01:01:52.779214666 +0300
-@@ -267,10 +267,16 @@
- Set to 0 to disable this feature.
- Note: not needed on Windows-based servers.
- */
--$config['ChmodFiles'] = 0777 ;
-+$config['ChmodFiles'] = 0777;
-
- /*
- See comments above.
- Used when creating folders that does not exist.
- */
--$config['ChmodFolders'] = 0755 ;
-+$config['ChmodFolders'] = 0755;
+--- ckfinder-2.4/config.php~ 2013-12-16 13:09:51.017571971 +0200
++++ ckfinder-2.4/config.php 2013-12-16 13:10:26.263671492 +0200
+@@ -333,3 +333,9 @@
+ $config['plugin_imageresize']['smallThumb'] = '90x90';
+ $config['plugin_imageresize']['mediumThumb'] = '120x120';
+ $config['plugin_imageresize']['largeThumb'] = '180x180';
+
+// load additional context sensitive config
+// use webserver setenv directives to set this variable.
diff --git a/error_reporting.patch b/error_reporting.patch
deleted file mode 100644
index d30f320..0000000
--- a/error_reporting.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ckfinder-1.4.2/./core/connector/php/connector.php~ 2010-05-26 19:50:10.000000000 +0300
-+++ ckfinder-1.4.2/./core/connector/php/connector.php 2010-05-26 19:50:50.329046561 +0300
-@@ -20,12 +20,6 @@
- */
-
- /**
-- * Protect against sending warnings to the browser (#186).
-- * Comment out this line during debugging.
-- */
--error_reporting(0);
--
--/**
- * Protect against sending content before all HTTP headers are sent (#186).
- */
- ob_start();
diff --git a/paths.patch b/paths.patch
index 1c33d3f..ac89f9f 100644
--- a/paths.patch
+++ b/paths.patch
@@ -1,24 +1,21 @@
---- ckfinder-1.4.2/core/connector/php/constants.php~ 2010-02-16 13:30:42.000000000 +0200
-+++ ckfinder-1.4.2/core/connector/php/constants.php 2010-02-16 13:36:02.329273954 +0200
-@@ -48,7 +48,7 @@
+--- ckfinder-2.4/core/connector/php/constants.php~ 2013-12-16 13:08:01.622665556 +0200
++++ ckfinder-2.4/core/connector/php/constants.php 2013-12-16 13:09:17.471445092 +0200
+@@ -58,16 +58,9 @@
- define('CKFINDER_CONNECTOR_DEFAULT_USER_FILES_PATH',"/userfiles/");
- define('CKFINDER_CONNECTOR_LANG_PATH',"./lang");
--define('CKFINDER_CONNECTOR_CONFIG_FILE_PATH',"./../../../config.php");
-+define('CKFINDER_CONNECTOR_CONFIG_FILE_PATH',"/etc/webapps/ckfinder/config.php");
+ define('CKFINDER_CONNECTOR_DEFAULT_USER_FILES_PATH','/userfiles/');
+ define('CKFINDER_CONNECTOR_LANG_PATH',$basedir . '/lang');
+-define('CKFINDER_CONNECTOR_CONFIG_FILE_PATH',$basedir . '/../../../config.php');
++define('CKFINDER_CONNECTOR_CONFIG_FILE_PATH', '/etc/webapps/ckfinder/config.php');
- if (version_compare(phpversion(), '6', '>=')) {
- define('CKFINDER_CONNECTOR_PHP_MODE', 6);
-@@ -60,11 +60,7 @@
- define('CKFINDER_CONNECTOR_PHP_MODE', 4);
- }
-
--if (CKFINDER_CONNECTOR_PHP_MODE == 4) {
-- define('CKFINDER_CONNECTOR_LIB_DIR', "./php4");
--} else {
-- define('CKFINDER_CONNECTOR_LIB_DIR', "./php5");
+-if (version_compare(phpversion(),'6','>=')) {
+- define('CKFINDER_CONNECTOR_PHP_MODE',6);
+-}
+-else {
+- define('CKFINDER_CONNECTOR_PHP_MODE',5);
-}
-+define('CKFINDER_CONNECTOR_LIB_DIR', "./");
+-
+-define('CKFINDER_CONNECTOR_LIB_DIR',$basedir . '/php5');
++define('CKFINDER_CONNECTOR_LIB_DIR', './');
- define('CKFINDER_CHARS', '123456789ABCDEFGHJKLMNPQRSTUVWXYZ');
- define('CKFINDER_REGEX_IMAGES_EXT', '/\.(jpg|gif|png|bmp|jpeg)$/i');
+ define('CKFINDER_CHARS','123456789ABCDEFGHJKLMNPQRSTUVWXYZ');
+ define('CKFINDER_REGEX_IMAGES_EXT','/\.(jpg|gif|png|bmp|jpeg)$/i');
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ckfinder.git/commitdiff/66d1805bed1c2ebe23d47be82097fed91c648fc5
More information about the pld-cvs-commit
mailing list