Author: glen Date: Thu Sep 16 10:06:25 2010 GMT Module: packages Tag: HEAD ---- Log message: - use iconv ext, instead of pure php code
---- Files affected: packages/roundcubemail: roundcubemail.spec (1.101 -> 1.102) , use-iconv.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/roundcubemail/roundcubemail.spec diff -u packages/roundcubemail/roundcubemail.spec:1.101 packages/roundcubemail/roundcubemail.spec:1.102 --- packages/roundcubemail/roundcubemail.spec:1.101 Thu Sep 16 11:48:10 2010 +++ packages/roundcubemail/roundcubemail.spec Thu Sep 16 12:06:20 2010 @@ -2,6 +2,9 @@ # TODO: # - move bin/* to -setup which are related to upgrading/setup # - use system js/tiny_mce +# - use system js/jquery +# - use system magic db: program/lib/magic +# - script to %lang all "localization" dirs # - package: http://blog.ilohamail.org/ and remove boundled classess from it # - Some php-database backend. Suggests? # - test/finish and then enable by default password-anon-ldap-bind patch @@ -33,6 +36,7 @@ Patch2: %{name}-postfixadmin-pl_locales.patch Patch3: %{name}-faq-page.patch Patch4: %{name}-password-anon-ldap-bind.patch +Patch5: use-iconv.patch URL: http://www.roundcube.net/ BuildRequires: rpm-php-pearprov >= 4.4.2-11 BuildRequires: rpmbuild(macros) >= 1.553 @@ -41,6 +45,7 @@ Requires: php-common >= 4:%{php_min_version} Requires: php-date Requires: php-dom +Requires: php-iconv Requires: php-imap Requires: php-pcre Requires: php-pear-DB @@ -56,7 +61,6 @@ Requires: webserver(php) Suggests: php(fileinfo) Suggests: php-gd -Suggests: php-iconv Suggests: php-json Suggests: php-mbstring Suggests: php-mcrypt @@ -142,6 +146,7 @@ %if %{with password_anon_ldap_bind} %patch4 -p1 %endif +%patch5 -p1 find -name .svn | xargs -r rm -rf @@ -157,6 +162,10 @@ # unpacked js sources find -name '*.src' | xargs rm -v +# rm utf8.class and deps, we use iconv extension +rm program/lib/utf8.class.php +rm -r program/lib/encoding + # php-pear-PEAR-core 1.9.0 (used indirectly) rm program/lib/PEAR.php rm program/lib/PEAR5.php @@ -415,6 +424,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.102 2010/09/16 10:06:20 glen +- use iconv ext, instead of pure php code + Revision 1.101 2010/09/16 09:48:10 glen - remove js sources ================================================================ Index: packages/roundcubemail/use-iconv.patch diff -u /dev/null packages/roundcubemail/use-iconv.patch:1.1 --- /dev/null Thu Sep 16 12:06:25 2010 +++ packages/roundcubemail/use-iconv.patch Thu Sep 16 12:06:20 2010 @@ -0,0 +1,12 @@ +--- roundcubemail-0.4/program/include/main.inc~ 2010-09-16 13:01:45.350103817 +0300 ++++ roundcubemail-0.4/program/include/main.inc 2010-09-16 13:02:12.636921259 +0300 +@@ -29,9 +29,6 @@ + require_once('lib/utf7.inc'); + require_once('include/rcube_shared.inc'); + +-// fallback if not PHP modules are available +...@include_once('lib/utf8.class.php'); +- + // define constannts for input reading + define('RCUBE_INPUT_GET', 0x0101); + define('RCUBE_INPUT_POST', 0x0102); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/roundcubemail/roundcubemail.spec?r1=1.101&r2=1.102&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
