rpms/php-ZendFramework/F-9 php-ZendFramework.spec, 1.4, 1.5 sources, 1.4, 1.5

[Alexander Kahl]

Author: akahl

Update of /cvs/pkgs/rpms/php-ZendFramework/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10946

Modified Files:
	php-ZendFramework.spec sources 
Log Message:
* F-10 -> F-9


Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-9/php-ZendFramework.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-ZendFramework.spec	12 Nov 2008 09:50:05 -0000	1.4
+++ php-ZendFramework.spec	20 Nov 2008 10:04:59 -0000	1.5
@@ -2,7 +2,7 @@
 
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
-Version:         1.6.2
+Version:         1.7.0
 Release:         2%{?dist}
 
 License:         BSD
@@ -29,8 +29,16 @@
 Requires: php-spl
 Requires: php-zlib
 Requires: php-Fileinfo
+Requires: php-pdo
+Requires: php-xml
 BuildRequires: symlinks
 
+# For ZendX documentation
+BuildRequires: autoconf, make
+BuildRequires: libxslt, libxml2
+BuildRequires: docbook-style-xsl
+
+
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
 object-oriented best practices, corporate friendly licensing, and a rigorously
@@ -60,6 +68,16 @@
 This package includes Zend Framework unit tests for all available subpackages.
 
 
+%package extras
+Summary:  Zend Framework Extras (ZendX)
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-ZendX = %{version}-%{release}
+
+%description extras
+This package includes the ZendX libraries.
+
+
 %package Cache-Backend-Apc
 Summary:  Zend Framework APC cache backend
 Group:    Development/Libraries
@@ -258,6 +276,13 @@
 
 %{__cat} executables valid_executables|sort|uniq -u > invalid_executables
 
+cd extras/documentation/manual/en
+%{__autoconf}
+%configure --with-xsltproc="$(which xsltproc) --path \
+           '%{_datadir}/sgml/docbook/xsl-stylesheets/htmlhelp' --nonet"
+%{__make} %{?_smp_mflags}
+cd ../../../..
+
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -267,14 +292,24 @@
 %{__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
+# ZendX
+cd extras
+%{__cp} -pr library/ZendX $RPM_BUILD_ROOT%{_datadir}/php
+%{__cp} -pr tests $RPM_BUILD_ROOT%{_datadir}/php/ZendX
+cd ..
+
+
+# Zend_Tool, still in development
+# cd incubator
+# %{__cp} -pr library/Zend/Tool $RPM_BUILD_ROOT%{_datadir}/php/Zend
+# %{__cp} -pr tests/* $RPM_BUILD_ROOT%{_datadir}/php/Zend/tests
+# %{__cp} -pr bin/zf.{php,sh} \
+#   $RPM_BUILD_ROOT%{_datadir}/php/Zend
+# %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
+# %{__ln_s} $RPM_BUILD_ROOT%{_datadir}/php/Zend/zf.sh \
+#   $RPM_BUILD_ROOT%{_bindir}/zf
+# symlinks -c $RPM_BUILD_ROOT%{_bindir} > /dev/null
+# cd ..
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -320,8 +355,7 @@
 %exclude %{_datadir}/php/Zend/Service/Yahoo.php
 %exclude %{_datadir}/php/Zend/Service/Yahoo
 %exclude %{_datadir}/php/Zend/externals/dojo
-%{_datadir}/php/ZendL
-%{_bindir}/zf
+# %{_bindir}/zf
 
 %doc LICENSE.txt INSTALL.txt README.txt
 
@@ -335,6 +369,11 @@
 %{_datadir}/php/Zend/tests
 %doc LICENSE.txt
 
+%files extras
+%defattr(-,root,root,-)
+%{_datadir}/php/ZendX
+%doc LICENSE.txt extras/documentation/manual/en/html/*
+
 %files Cache-Backend-Apc
 %defattr(-,root,root,-)
 %{_datadir}/php/Zend/Cache/Backend/Apc.php
@@ -408,6 +447,14 @@
 
 
 %changelog
+* Thu Nov 20 2008 Alexander Kahl <akahl at iconmobile.com> - 1.7.0-2
+- bump, forgot internal docbook fix from rawhide build
+
+* Tue Nov 18 2008 Alexander Kahl <akahl at iconmobile.com> - 1.7.0-1
+- update to 1.7.0
+- fix to use internal docbook
+- deactivate incubator development stuff for non-rawhide
+
 * Wed Nov 12 2008 Alexander Kahl <akahl at iconmobile.com> - 1.6.2-2
 - last tag failed, bump
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2008 09:42:29 -0000	1.4
+++ sources	20 Nov 2008 10:04:59 -0000	1.5
@@ -1 +1 @@
-d1ad283f9190688fcae0daf25625e3cb  ZendFramework-1.6.2.tar.gz
+423629a9be793d3b6df352913f8c1401  ZendFramework-1.7.0.tar.gz