SPECS: php4.spec - make getimagesize() work with compressed .swf f...
glen
glen at pld-linux.org
Fri Jan 6 18:38:16 CET 2006
Author: glen Date: Fri Jan 6 17:38:16 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- make getimagesize() work with compressed .swf files, without need for statically linked zlib extension
- adapterized
---- Files affected:
SPECS:
php4.spec (1.511 -> 1.512)
---- Diffs:
================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.511 SPECS/php4.spec:1.512
--- SPECS/php4.spec:1.511 Fri Jan 6 15:59:24 2006
+++ SPECS/php4.spec Fri Jan 6 18:38:11 2006
@@ -51,7 +51,6 @@
%bcond_without apache1 # disable building apache 1.3.x module
%bcond_without apache2 # disable building apache 2.x module
%bcond_without zts # disable experimental-zts
-%bcond_with zlib_static # build zlib static. needed for getimagesize() to understand flash6 files
%define apxs1 /usr/sbin/apxs1
%define apxs2 /usr/sbin/apxs
@@ -81,8 +80,8 @@
%define _rel 10
Release: %{_rel}%{?with_hardening:hardened}
Epoch: 3
-Group: Libraries
License: PHP
+Group: Libraries
Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
# Source0-md5: 6b5726471189f8a1f26dd7cc5e19b442
Source1: FAQ.%{name}
@@ -135,6 +134,7 @@
Patch37: %{name}-bug-35056.patch
Patch38: %{name}-bug-35067.patch
Patch39: php-dextension.patch
+Patch40: %{name}-zlib-for-getimagesize.patch
#Icon: php4.gif
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
@@ -160,8 +160,8 @@
%endif
BuildRequires: freetype-devel >= 2.0
%{?with_fribidi:BuildRequires: fribidi-devel >= 0.10.4}
-BuildRequires: gd-devel(gif)
BuildRequires: gd-devel >= 2.0.28-2
+BuildRequires: gd-devel(gif)
BuildRequires: gdbm-devel
BuildRequires: gmp-devel
%{?with_imap:BuildRequires: heimdal-devel >= 0.7}
@@ -305,8 +305,8 @@
Requires: apache1-mod_mime
Provides: php = %{epoch}:%{version}-%{release}
Provides: php4 = %{epoch}:%{version}-%{release}
-Obsoletes: phpfi
Obsoletes: apache-mod_php < 1:4.1.1
+Obsoletes: phpfi
# Obsolete last version when apache module was in main package
Obsoletes: php4 < 3:4.3.11-4.16
@@ -321,12 +321,12 @@
Summary(pl): Moduł DSO (Dynamic Shared Object) php4 dla apache 2.x
Group: Development/Languages/PHP
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: apache(modules-api) = %{apache_modules_api}
Requires: apache >= 2.2.0
+Requires: apache(modules-api) = %{apache_modules_api}
Provides: php = %{epoch}:%{version}-%{release}
Provides: php4 = %{epoch}:%{version}-%{release}
-Obsoletes: phpfi
Obsoletes: apache-mod_php < 1:4.1.1
+Obsoletes: phpfi
# Obsolete last version when apache module was in main package
Obsoletes: php4 < 3:4.3.11-4.16
@@ -341,8 +341,8 @@
Summary(pl): php4 jako program FastCGI
Group: Development/Languages/PHP
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Provides: php-fcgi = %{epoch}:%{version}-%{release}
Provides: php = %{epoch}:%{version}-%{release}
+Provides: php-fcgi = %{epoch}:%{version}-%{release}
Provides: php4 = %{epoch}:%{version}-%{release}
%description fcgi
@@ -403,13 +403,13 @@
Provides: %{name}-openssl = %{epoch}:%{version}-%{release}
Provides: %{name}-session = %{epoch}:%{version}-%{release}
Provides: %{name}-standard = %{epoch}:%{version}-%{release}
+Provides: php(modules_api) = %{php_api_version}
+Provides: php(zend_extension_api) = %{zend_extension_api}
+Provides: php(zend_module_api) = %{zend_module_api}
Provides: php-common = %{epoch}:%{version}-%{release}
Provides: php-openssl = %{epoch}:%{version}-%{release}
Provides: php-session = %{epoch}:%{version}-%{release}
Provides: php-standard = %{epoch}:%{version}-%{release}
-Provides: php(modules_api) = %{php_api_version}
-Provides: php(zend_module_api) = %{zend_module_api}
-Provides: php(zend_extension_api) = %{zend_extension_api}
Provides: php4(debug) = %{php_debug}
Provides: php4(thread-safety) = %{zend_zts}
Obsoletes: php-session < 3:4.2.1-2
@@ -776,8 +776,8 @@
Group: Libraries
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: gd(gif)
Requires: gd >= 2.0.28-2
+Requires: gd(gif)
Provides: %{name}-gd(gif) = %{epoch}:%{version}-%{release}
Provides: php-gd = %{epoch}:%{version}-%{release}
@@ -1407,7 +1407,7 @@
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: php-sybase = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-sybase-ct
+Obsoletes: php4-sybase-ct
%description sybase
This is a dynamic shared object (DSO) for PHP that will add Sybase and
@@ -1427,7 +1427,7 @@
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: php-sybase-ct = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-sybase
+Obsoletes: php4-sybase
%description sybase-ct
This is a dynamic shared object (DSO) for PHP that will add Sybase and
@@ -1677,6 +1677,7 @@
%patch37 -p1
%patch38 -p1
%patch39 -p1
+%patch40 -p1
%if %{with hardening}
zcat %{SOURCE9} | patch -p1
@@ -2498,13 +2499,11 @@
%postun zip
%extension_postun
-%if %{without zlib_static}
%post zlib
%extension_post
%postun zlib
%extension_postun
-%endif
# openssl trigger on common package. it removes shared openssl module from php.ini, if it was there.
%triggerun common -- %{name}-openssl < 3:4.4.0-4
@@ -3247,10 +3246,8 @@
%files zlib
%defattr(644,root,root,755)
%doc ext/zlib/CREDITS
-%if %{without zlib_static}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/zlib.ini
%attr(755,root,root) %{extensionsdir}/zlib.so
-%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -3258,6 +3255,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.512 2006/01/06 17:38:11 glen
+- make getimagesize() work with compressed .swf files, without need for statically linked zlib extension
+- adapterized
+
Revision 1.511 2006/01/06 14:59:24 glen
- zlib_static bcond until better fix is available
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.511&r2=1.512&f=u
More information about the pld-cvs-commit
mailing list