packages: magento/magento.spec - up to 1.4.1.1; drop bundled Zend

[glen]

Author: glen                         Date: Mon Aug 30 19:13:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.4.1.1; drop bundled Zend

---- Files affected:
packages/magento:
   magento.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/magento/magento.spec
diff -u packages/magento/magento.spec:1.6 packages/magento/magento.spec:1.7
--- packages/magento/magento.spec:1.6	Fri Aug 27 15:37:50 2010
+++ packages/magento/magento.spec	Mon Aug 30 21:13:27 2010
@@ -5,13 +5,13 @@
 %define		php_min_version 5.2.0
 Summary:	An open-source eCommerce platform focused on flexibility and control
 Name:		magento
-Version:	1.4.1.0
-Release:	0.7
+Version:	1.4.1.1
+Release:	0.2
 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:	e497d08f95cf0b788dbc7c8e8b574034
+# Source0-md5:	319882ad9eaef8b7312071ba48a8045a
 Source1:	apache.conf
 Source2:	%{name}-crontab
 Source3:	%{name}-cron_disabled.php
@@ -73,6 +73,10 @@
 %prep
 %setup -qc
 mv %{name}/{.??*,*} . && rmdir %{name}
+
+# use system Zend, magento has bundled ZF somewhere between versions 1.9.6 and 1.9.7
+rm -rf lib/Zend
+
 %undos -f php,phtml
 #%patch0 -p1
 %patch1 -p1
@@ -94,9 +98,6 @@
 mv *sample doc
 mv .htaccess.sample doc/htaccess.sample
 
-# use system Zend
-#rm -rf lib/Zend
-
 # contents included in apache.conf
 find -name .htaccess | xargs rm
 
@@ -174,7 +175,7 @@
 %{_appdir}/lib/PEAR
 %{_appdir}/lib/phpseclib
 %{_appdir}/lib/Varien
-%{_appdir}/lib/Zend
+#%{_appdir}/lib/Zend
 %attr(775,root,http) %dir %{_appdir}/media
 %attr(775,root,http) %dir %{_appdir}/var
 %{_appdir}/favicon.ico
@@ -198,6 +199,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/08/30 19:13:27  glen
+- up to 1.4.1.1; drop bundled Zend
+
 Revision 1.6  2010/08/27 13:37:50  glen
 - create default config (local.xml) so it is packaged
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/magento/magento.spec?r1=1.6&r2=1.7&f=u