Author: glen Date: Tue Dec 14 15:46:08 2010 GMT Module: packages Tag: HEAD ---- Log message: - with system_zf bcond (disabled default)
---- Files affected: packages/magento: magento.spec (1.10 -> 1.11) ---- Diffs: ================================================================ Index: packages/magento/magento.spec diff -u packages/magento/magento.spec:1.10 packages/magento/magento.spec:1.11 --- packages/magento/magento.spec:1.10 Tue Dec 14 14:58:51 2010 +++ packages/magento/magento.spec Tue Dec 14 16:46:02 2010 @@ -1,26 +1,30 @@ # $Revision$, $Date$ # TODO # - writable dirs: Ensure that the directories app/etc, var, and media are writable by the web server +# +# Conditional build: +%bcond_with system_zf # use system ZF, unfinished + %include /usr/lib/rpm/macros.php %define php_min_version 5.2.0 Summary: An open-source eCommerce platform focused on flexibility and control Name: magento Version: 1.4.1.1 -Release: 0.10 +Release: 0.13 License: Open Software License (OSL 3.0) Group: Applications/WWW URL: http://www.magentocommerce.com/ Source0: http://www.magentocommerce.com/downloads/assets/%{version}/%{name}-%{version}.tar.bz2 # Source0-md5: 319882ad9eaef8b7312071ba48a8045a Source1: apache.conf -Source2: %{name}-crontab -Source3: %{name}-cron_disabled.php -Source4: %{name}-cron_import.php -Source5: %{name}-cron_export.php -Patch0: %{name}-1.3.2.3-php43.patch -Patch1: %{name}-1.3.2.1-categories_id.patch -Patch2: %{name}-1.3.2.1-cron_export_fix_lang.patch -Patch3: %{name}-1.3.2.4-homelist_random.patch +Source2: crontab +Source3: cron_disabled.php +Source4: cron_import.php +Source5: cron_export.php +Patch0: php43.patch +Patch1: categories_id.patch +Patch2: cron_export_fix_lang.patch +Patch3: homelist_random.patch Patch4: pld-mysql-root.patch Patch5: amcustomerattr-optional.patch Patch6: local.xml-empty.patch @@ -96,7 +100,9 @@ mv %{name}/{.??*,*} . && rmdir %{name} # use system Zend, magento has bundled ZF somewhere between versions 1.9.6 and 1.9.7 +%if %{with system_zf} rm -r lib/Zend +%endif # php-pear-PEAR 1.7.2 rm lib/PEAR/PEAR.php @@ -232,7 +238,9 @@ %{_appdir}/lib/PEAR %{_appdir}/lib/phpseclib %{_appdir}/lib/Varien -#%{_appdir}/lib/Zend +%if %{without system_zf} +%{_appdir}/lib/Zend +%endif %attr(775,root,http) %dir %{_appdir}/media %attr(775,root,http) %dir %{_appdir}/var %{_appdir}/favicon.ico @@ -265,6 +273,7 @@ %{_appdir}/app/design/install/default/default/template/install %files downloader +%defattr(644,root,root,755) %dir %{_appdir}/downloader %{_appdir}/downloader/* @@ -274,6 +283,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2010/12/14 15:46:02 glen +- with system_zf bcond (disabled default) + Revision 1.10 2010/12/14 13:58:51 glen - downloader subpackage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/magento/magento.spec?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
