Author: glen Date: Wed May 26 22:04:39 2010 GMT Module: packages Tag: HEAD ---- Log message: - add fckeditor-like config overloading
---- Files affected: packages/ckfinder: ckfinder.spec (1.3 -> 1.4) , config.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/ckfinder/ckfinder.spec diff -u packages/ckfinder/ckfinder.spec:1.3 packages/ckfinder/ckfinder.spec:1.4 --- packages/ckfinder/ckfinder.spec:1.3 Wed May 26 19:55:02 2010 +++ packages/ckfinder/ckfinder.spec Thu May 27 00:04:34 2010 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Edytor tekstowy dla Internetu Name: ckfinder Version: 1.4.2 -Release: 0.19 +Release: 0.20 License: Custom Group: Applications/WWW Source0: http://download.cksource.com/CKFinder/CKFinder%20for%20PHP/%{version}/%{name}_php_%{version}.tar.gz @@ -11,10 +11,11 @@ URL: http://www.ckfinder.com/ Patch0: error_reporting.patch Patch1: paths.patch +Patch2: config.patch Source1: find-lang.sh Source2: apache.conf Source3: lighttpd.conf -BuildRequires: rpmbuild(macros) > 1.268 +BuildRequires: rpmbuild(macros) >= 1.565 BuildRequires: sed >= 4.0 #Requires: php-gd Requires: webapps @@ -72,11 +73,11 @@ mv core/connector/php/php5/* core/connector/php rmdir core/connector/php/php5 -# undos the files -find '(' -name '*.js' -o -name '*.css' -o -name '*.txt' -o -name '*.html' -o -name '*.php' ')' -print0 | xargs -0 sed -i -e 's,\r$,,' +%undos -f js,css,txt,html,php %patch0 -p1 %patch1 -p1 +%patch2 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -170,6 +171,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2010/05/26 22:04:34 glen +- add fckeditor-like config overloading + Revision 1.3 2010/05/26 17:55:02 glen - add missing paths.patch; ================================================================ Index: packages/ckfinder/config.patch diff -u /dev/null packages/ckfinder/config.patch:1.1 --- /dev/null Thu May 27 00:04:39 2010 +++ packages/ckfinder/config.patch Thu May 27 00:04:34 2010 @@ -0,0 +1,21 @@ +--- 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; ++ ++// load additional context sensitive config ++// use webserver setenv directives to set this variable. ++if (isset($_SERVER['CKFINDER_CONFIG'])) { ++ require $_SERVER['CKFINDER_CONFIG']; ++} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ckfinder/ckfinder.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
