rpms/php-ZendFramework/devel .cvsignore, 1.2, 1.3 php-ZendFramework.spec, 1.1, 1.2 sources, 1.2, 1.3

Sun Sep 14 20:30:23 UTC 2008

Author: akahl

Update of /cvs/pkgs/rpms/php-ZendFramework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17807

Modified Files:
	.cvsignore php-ZendFramework.spec sources 
Log Message:
* new sources and specfile for 1.6.0 stable



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	7 Aug 2008 09:19:19 -0000	1.2
+++ .cvsignore	14 Sep 2008 20:29:53 -0000	1.3
@@ -1 +1 @@
-ZendFramework-1.6.0RC1.tar.gz
+ZendFramework-1.6.0.tar.gz


Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/php-ZendFramework.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-ZendFramework.spec	7 Aug 2008 09:19:19 -0000	1.1
+++ php-ZendFramework.spec	14 Sep 2008 20:29:53 -0000	1.2
@@ -3,11 +3,11 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.6.0
-Release:         0.2.rc1%{?dist}
+Release:         1%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
-Source0:         http://framework.zend.com/releases/%{php_name}-%{version}RC1/%{php_name}-%{version}RC1.tar.gz
+Source0:         http://framework.zend.com/releases/%{php_name}-%{version}/%{php_name}-%{version}.tar.gz
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:             http://framework.zend.com/
 
@@ -29,7 +29,7 @@
 Requires: php-spl
 Requires: php-zlib
 Requires: php-Fileinfo
-
+BuildRequires: symlinks
 
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
@@ -93,6 +93,26 @@
 # via sqlite databases.
 
 
+%package Captcha
+Summary:  Zend Framework CAPTCHA component
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: php-gd
+
+%description Captcha
+This package contains the Zend Framework CAPTCHA extension.
+
+
+%package Dojo
+Summary:  Zend Framework Dojo Toolkit integration component
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description Dojo
+This package contains the Zend Framework Dojo Toolkit component as well as a
+copy of Dojo itself.
+
+
 %package Db-Adapter-Mysqli
 Summary:  Zend Framework database adapter for mysqli
 Group:    Development/Libraries
@@ -227,10 +247,16 @@
 
 
 %prep
-%setup -qn %{php_name}-1.6RC1
+%setup -qn %{php_name}-%{version}
 
 %build
-find . -type f -perm /111 -exec chmod -x '{}' \; >/dev/null
+find . -type f -perm /111 \
+  -fprint executables -exec %{__chmod} -x '{}' \; >/dev/null
+
+find . -type f -name \*.sh \
+  -fprint valid_executables -exec %{__chmod} +x '{}' \; >/dev/null
+
+%{__cat} executables valid_executables|sort|uniq -u > invalid_executables
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -239,7 +265,16 @@
 %{__cp} -pr library/Zend $RPM_BUILD_ROOT%{_datadir}/php
 %{__cp} -pr demos/Zend $RPM_BUILD_ROOT%{_datadir}/php/Zend/demos
 %{__cp} -pr tests $RPM_BUILD_ROOT%{_datadir}/php/Zend
+%{__cp} -pr externals $RPM_BUILD_ROOT%{_datadir}/php/Zend
 
+%{__cp} -pr laboratory/Zend_Tool/library/ZendL $RPM_BUILD_ROOT%{_datadir}/php
+%{__cp} -pr laboratory/Zend_Tool/tests $RPM_BUILD_ROOT%{_datadir}/php/ZendL
+%{__cp} -pr laboratory/Zend_Tool/bin/zf.{php,sh} \
+  $RPM_BUILD_ROOT%{_datadir}/php/ZendL
+%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
+%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/php/ZendL/zf.sh \
+  $RPM_BUILD_ROOT%{_bindir}/zf
+symlinks -c $RPM_BUILD_ROOT%{_bindir} > /dev/null
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -252,6 +287,9 @@
 %exclude %{_datadir}/php/Zend/tests
 %exclude %{_datadir}/php/Zend/Cache/Backend/Apc.php
 %exclude %{_datadir}/php/Zend/Cache/Backend/Memcached.php
+%exclude %{_datadir}/php/Zend/Captcha
+%exclude %{_datadir}/php/Zend/Dojo.php
+%exclude %{_datadir}/php/Zend/Dojo
 %exclude %{_datadir}/php/Zend/Feed.php
 %exclude %{_datadir}/php/Zend/Feed
 %exclude %{_datadir}/php/Zend/Gdata.php
@@ -269,6 +307,8 @@
 %exclude %{_datadir}/php/Zend/Service/Flickr
 %exclude %{_datadir}/php/Zend/Service/Nirvanix.php
 %exclude %{_datadir}/php/Zend/Service/Nirvanix
+%exclude %{_datadir}/php/Zend/Service/ReCaptcha.php
+%exclude %{_datadir}/php/Zend/Service/ReCaptcha
 %exclude %{_datadir}/php/Zend/Service/Simpy.php
 %exclude %{_datadir}/php/Zend/Service/Simpy
 %exclude %{_datadir}/php/Zend/Service/SlideShare.php
@@ -279,6 +319,9 @@
 %exclude %{_datadir}/php/Zend/Service/Technorati
 %exclude %{_datadir}/php/Zend/Service/Yahoo.php
 %exclude %{_datadir}/php/Zend/Service/Yahoo
+%exclude %{_datadir}/php/Zend/externals/dojo
+%{_datadir}/php/ZendL
+%{_bindir}/zf
 
 %doc LICENSE.txt INSTALL.txt README.txt
 
@@ -302,6 +345,18 @@
 %{_datadir}/php/Zend/Cache/Backend/Memcached.php
 %doc LICENSE.txt
 
+%files Captcha
+%defattr(-,root,root,-)
+%{_datadir}/php/Zend/Captcha
+%doc LICENSE.txt
+
+%files Dojo
+%defattr(-,root,root,-)
+%{_datadir}/php/Zend/Dojo.php
+%{_datadir}/php/Zend/Dojo
+%{_datadir}/php/Zend/externals/dojo
+%doc LICENSE.txt
+
 %files Feed
 %defattr(-,root,root,-)
 %{_datadir}/php/Zend/Feed.php
@@ -337,6 +392,8 @@
 %{_datadir}/php/Zend/Service/Flickr
 %{_datadir}/php/Zend/Service/Nirvanix.php
 %{_datadir}/php/Zend/Service/Nirvanix
+%{_datadir}/php/Zend/Service/ReCaptcha.php
+%{_datadir}/php/Zend/Service/ReCaptcha
 %{_datadir}/php/Zend/Service/Simpy.php
 %{_datadir}/php/Zend/Service/Simpy
 %{_datadir}/php/Zend/Service/SlideShare.php
@@ -351,6 +408,12 @@
 
 
 %changelog
+* Sat Sep 13 2008 Alexander Kahl <akahl at iconmobile.com> - 1.6.0-1
+- update to 1.6.0 stable (full version)
+- create list of invalid executables in %%build for upstream
+- new components Captcha, Dojo, Service-ReCaptcha, Wildfire, Zend_Tool
+- BuildRequire symlinks to sanitize zf -> zf.sh symlink
+
 * Sat Aug  2 2008 Alexander Kahl <akahl at iconmobile.com> - 1.6.0-0.2.rc1
 - added license file to all packages to silence rpmline
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Aug 2008 09:19:19 -0000	1.2
+++ sources	14 Sep 2008 20:29:53 -0000	1.3
@@ -1 +1 @@
-196aef8904be20c199e536480f92c5c9  ZendFramework-1.6.0RC1.tar.gz
+bea1189701382f5f19b5167116c0ca0e  ZendFramework-1.6.0.tar.gz


