Author: glen Date: Mon Mar 8 15:14:44 2010 GMT Module: packages Tag: HEAD ---- Log message: - subpackages for Zend_TimeSync, Zend_Service, Zend_Server - fix typo in Zend/Serializer/Adapter/PythonPickle.php - revisit autodeps - update rpm whiteout rules; rel 2
---- Files affected: packages/ZendFramework: ZendFramework.spec (1.81 -> 1.82) ---- Diffs: ================================================================ Index: packages/ZendFramework/ZendFramework.spec diff -u packages/ZendFramework/ZendFramework.spec:1.81 packages/ZendFramework/ZendFramework.spec:1.82 --- packages/ZendFramework/ZendFramework.spec:1.81 Sun Feb 28 01:23:09 2010 +++ packages/ZendFramework/ZendFramework.spec Mon Mar 8 16:14:38 2010 @@ -1,15 +1,13 @@ # $Revision$, $Date$ -# # TODO # - check Zend/Pdf/FileParser/Image/Jpeg.php and Zend/Pdf/FileParser/Image/Tiff.php -# presence in Zend/Pdf/Image.php after update [not implemented in 1.10.0) -# +# presence in Zend/Pdf/Image.php after update [not implemented in 1.10.2) %include /usr/lib/rpm/macros.php Summary: Zend Framework Summary(pl.UTF-8): Szkielet Zend Name: ZendFramework Version: 1.10.2 -Release: 1 +Release: 2 License: New BSD License Group: Development/Languages/PHP Source0: http://framework.zend.com/releases/%{name}-%{version}/%{name}-%{version}.tar.gz @@ -26,13 +24,24 @@ BuildRequires: sed >= 4.0 Requires: php-common >= 4:5.1.4 Requires: php-pear -Requires: rpm-whiteout >= 1.12 +Requires: rpm-whiteout >= 1.32 Obsoletes: ZendFramework-doc BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -# exclude optional dependencies -%define _noautoreq 'php(oci8)' 'php(bitset)' 'pear(../application/bootstrap.php)' 'pear(Zend/Pdf/FileParser/Image/Tiff.php)' 'pear(Zend/Pdf/FileParser/Image/Jpeg.php)' +# bad depsolver +%define _noautopear pear(../application/bootstrap.php) + +# bad code +%define _bad_deps_1_10 pear(Zend/Pdf/FileParser/Image/Jpeg.php) pear(Zend/Pdf/FileParser/Image/Tiff.php) +%define _bad_deps_1_10_2 pear(Zend/Serializer/Excception.php) pear(Zend/Services/DeveloperGarden/Response/Exception.php) +%define _noautodeps %{?_bad_deps_1_10} %{?_bad_deps_1_10_2} + +# exclude optional php dependencies +%define _noautophp php-oci8 php-bitset + +# put it together for rpmbuild +%define _noautoreq %{?_noautophp} %{?_noautopear} %{?_noautodeps} %description Zend Framework is a high quality and open source framework for @@ -886,6 +895,17 @@ storable representation of php types by different facilities, and recover. +%package Zend_Server +Summary: Zend_Server +Group: Development/Languages/PHP +URL: http://framework.zend.com/manual/en/zend.server.html +Requires: %{name} = %{version}-%{release} + +%description Zend_Server +The Zend_Server family of classes provides functionality for the +various server classes, including Zend_XmlRpc_Server, +Zend_Rest_Server, Zend_Json_Server and Zend_Soap_Wsdl. + %package Zend_Server_Reflection Summary: Zend_Server_Reflection Group: Development/Languages/PHP @@ -900,6 +920,16 @@ list of function and method prototypes (i.e., all possible valid calling combinations), and function/method descriptions. +%package Zend_Service +Summary: Zend_Service +Group: Development/Languages/PHP +URL: http://framework.zend.com/manual/en/zend.service.html +Requires: %{name} = %{version}-%{release} + +%description Zend_Service +Zend_Service is an abstract class which serves as a foundation for web +service implementations, such as SOAP or REST. + %package Zend_Service_Akismet Summary: Zend_Service_Akismet Group: Development/Languages/PHP @@ -1240,6 +1270,18 @@ Zend_Test provides tools to facilitate unit testing of your Zend Framework applications. +%package Zend_TimeSync +Summary: Zend_TimeSync +Group: Development/Languages/PHP +URL: http://framework.zend.com/manual/en/zend.timesync.html +Requires: %{name} = %{version}-%{release} + +%description Zend_TimeSync +Zend_TimeSync is able to receive internet or network time from a time +server using the NTP or SNTP protocol. With Zend_TimeSync, Zend +Framework is able to act independently from the time settings of the +server where it is running. + %package Zend_Tool Summary: Zend_Tool Group: Development/Languages/PHP @@ -1397,7 +1439,9 @@ %patch0 -p1 %patch1 -p1 -install %{SOURCE2} find-lang.sh +install -p %{SOURCE2} find-lang.sh + +sed -i -e 's,Zend/Serializer/Excception.php,Zend/Serializer/Exception.php,' library/Zend/Serializer/Adapter/PythonPickle.php # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -1438,7 +1482,7 @@ cat >> $RPM_BUILD_ROOT%{_bindir}/zf <<-'EOF' #!/bin/sh cd %{php_pear_dir}/bin -exec /usr/bin/php -d Safe_mode=off zf.php ${1:+"$@"} +exec %{_bindir}/php -d safe_mode=off zf.php ${1:+"$@"} EOF ./find-lang.sh %{name}.lang @@ -1454,26 +1498,6 @@ %defattr(644,root,root,755) %doc LICENSE.txt README.txt %dir %{php_pear_dir}/Zend -%dir %{php_pear_dir}/Zend/Console -%dir %{php_pear_dir}/Zend/Search - -%dir %{php_pear_dir}/Zend/Server -%{php_pear_dir}/Zend/Server/Abstract.php -%{php_pear_dir}/Zend/Server/Exception.php -%{php_pear_dir}/Zend/Server/Interface.php -%{php_pear_dir}/Zend/Server/Definition.php -%dir %{php_pear_dir}/Zend/Server/Method -%{php_pear_dir}/Zend/Server/Method/Callback.php -%{php_pear_dir}/Zend/Server/Method/Definition.php -%{php_pear_dir}/Zend/Server/Method/Parameter.php -%{php_pear_dir}/Zend/Server/Method/Prototype.php - -%dir %{php_pear_dir}/Zend/Service -%{php_pear_dir}/Zend/Service/Abstract.php -%{php_pear_dir}/Zend/Service/Exception.php - -%{php_pear_dir}/Zend/TimeSync -%{php_pear_dir}/Zend/TimeSync.php %files Zend_Acl %defattr(644,root,root,755) @@ -1527,6 +1551,7 @@ %files Zend_Console_Getopt %defattr(644,root,root,755) +%dir %{php_pear_dir}/Zend/Console %{php_pear_dir}/Zend/Console/Getopt %{php_pear_dir}/Zend/Console/Getopt.php @@ -1723,6 +1748,7 @@ %files Zend_Search_Lucene %defattr(644,root,root,755) +%dir %{php_pear_dir}/Zend/Search %{php_pear_dir}/Zend/Search/Exception.php %{php_pear_dir}/Zend/Search/Lucene %{php_pear_dir}/Zend/Search/Lucene.php @@ -1732,11 +1758,30 @@ %{php_pear_dir}/Zend/Serializer %{php_pear_dir}/Zend/Serializer.php +%files Zend_Server +%defattr(644,root,root,755) +%dir %{php_pear_dir}/Zend/Server +%{php_pear_dir}/Zend/Server/Abstract.php +%{php_pear_dir}/Zend/Server/Exception.php +%{php_pear_dir}/Zend/Server/Interface.php +%{php_pear_dir}/Zend/Server/Definition.php +%dir %{php_pear_dir}/Zend/Server/Method +%{php_pear_dir}/Zend/Server/Method/Callback.php +%{php_pear_dir}/Zend/Server/Method/Definition.php +%{php_pear_dir}/Zend/Server/Method/Parameter.php +%{php_pear_dir}/Zend/Server/Method/Prototype.php + %files Zend_Server_Reflection %defattr(644,root,root,755) %{php_pear_dir}/Zend/Server/Reflection %{php_pear_dir}/Zend/Server/Reflection.php +%files Zend_Service +%defattr(644,root,root,755) +%dir %{php_pear_dir}/Zend/Service +%{php_pear_dir}/Zend/Service/Abstract.php +%{php_pear_dir}/Zend/Service/Exception.php + %files Zend_Service_Akismet %defattr(644,root,root,755) %{php_pear_dir}/Zend/Service/Akismet.php @@ -1835,6 +1880,11 @@ %defattr(644,root,root,755) %{php_pear_dir}/Zend/Test +%files Zend_TimeSync +%defattr(644,root,root,755) +%{php_pear_dir}/Zend/TimeSync +%{php_pear_dir}/Zend/TimeSync.php + %files Zend_Tool %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/zf @@ -1887,6 +1937,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.82 2010/03/08 15:14:38 glen +- subpackages for Zend_TimeSync, Zend_Service, Zend_Server +- fix typo in Zend/Serializer/Adapter/PythonPickle.php +- revisit autodeps +- update rpm whiteout rules; rel 2 + Revision 1.81 2010/02/28 00:23:09 adamg - updated to 1.10.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ZendFramework/ZendFramework.spec?r1=1.81&r2=1.82&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
