rpms/php-ZendFramework/F-10 php-ZendFramework.spec, 1.6, 1.7 sources, 1.5, 1.6

Alexander Kahl akahl at fedoraproject.org
Fri Jan 2 11:37:55 UTC 2009


Author: akahl

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

Modified Files:
	php-ZendFramework.spec sources 
Log Message:
* update to 1.7.2



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-10/php-ZendFramework.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-ZendFramework.spec	20 Nov 2008 09:39:30 -0000	1.6
+++ php-ZendFramework.spec	2 Jan 2009 11:37:25 -0000	1.7
@@ -2,8 +2,8 @@
 
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
-Version:         1.7.0
-Release:         2%{?dist}
+Version:         1.7.2
+Release:         1%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -33,12 +33,6 @@
 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
@@ -63,6 +57,8 @@
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.0.0
+Requires: bitstream-vera-fonts
+BuildRequires: bitstream-vera-fonts
 
 %description tests
 This package includes Zend Framework unit tests for all available subpackages.
@@ -276,12 +272,6 @@
 
 %{__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
@@ -311,6 +301,22 @@
 # symlinks -c $RPM_BUILD_ROOT%{_bindir} > /dev/null
 # cd ..
 
+
+# Bug 477440
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera
+
+cd $RPM_BUILD_ROOT%{_datadir}/php/Zend/tests/Zend/Pdf/_fonts
+%{__rm} -f *.ttf
+
+for file in /usr/share/fonts/bitstream-vera/*.ttf
+do
+  touch $RPM_BUILD_ROOT${file}
+done
+%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera/* .
+symlinks -c . > /dev/null
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/fonts
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -372,7 +378,7 @@
 %files extras
 %defattr(-,root,root,-)
 %{_datadir}/php/ZendX
-%doc LICENSE.txt extras/documentation/manual/en/html/*
+%doc LICENSE.txt extras/documentation/api/extras/*
 
 %files Cache-Backend-Apc
 %defattr(-,root,root,-)
@@ -447,7 +453,12 @@
 
 
 %changelog
-* Thu Nov 20 2008 Alexander Kahl <akahl at iconmobile.com> - 1.7.0-1
+* Fri Jan  2 2009 Alexander Kahl <akahl at iconmobile.com> - 1.7.2-1
+- update to 1.7.2
+- ZendX documentation doesn't need regeneration anymore, removed deps
+- Bug 477440: Use Vera fonts from Fedora's package
+
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Nov 2008 09:29:19 -0000	1.5
+++ sources	2 Jan 2009 11:37:25 -0000	1.6
@@ -1 +1 @@
-423629a9be793d3b6df352913f8c1401  ZendFramework-1.7.0.tar.gz
+7bc33a0ed379f30ab408ecd546025a1b  ZendFramework-1.7.2.tar.gz




More information about the fedora-extras-commits mailing list