SPECS (DEVEL): php.spec - merge from HEAD

arekm arekm at pld-linux.org
Sat Oct 29 15:51:49 CEST 2005


Author: arekm                        Date: Sat Oct 29 13:51:49 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- merge from HEAD

---- Files affected:
SPECS:
   php.spec (1.467.2.20 -> 1.467.2.21) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.467.2.20 SPECS/php.spec:1.467.2.21
--- SPECS/php.spec:1.467.2.20	Sat Oct 29 15:44:49 2005
+++ SPECS/php.spec	Sat Oct 29 15:51:44 2005
@@ -49,6 +49,7 @@
 %bcond_without	apache1		# disable building apache 1.3.x module
 %bcond_without	apache2		# disable building apache 2.x module
 %bcond_without	fcgi		# disable building FCGI SAPI
+%bcond_without	zts		# disable experimental-zts
 
 %define apxs1		/usr/sbin/apxs1
 %define	apxs2		/usr/sbin/apxs
@@ -62,6 +63,10 @@
 %undefine	with_interbase
 %endif
 
+%if %{without apache1} && %{without apache2}
+ERROR: You need to select at least one Apache SAPI to build shared modules.
+%endif
+
 # x86-only lib
 %ifnarch %{ix86}
 %undefine	with_msession
@@ -191,7 +196,7 @@
 BuildRequires:	apache1-devel
 %endif
 %if %{with apache2}
-BuildRequires:	apache-devel >= 2.0.44-1
+BuildRequires:	apache-devel >= 2.0.52-2
 BuildRequires:	apr-devel >= 1:1.0.0
 BuildRequires:	apr-util-devel >= 1:1.0.0
 %endif
@@ -205,6 +210,8 @@
 %define		php_api_version		20041225
 %define		zend_module_api		20050922
 %define		zend_extension_api	220051025
+%define		zend_zts			%{!?with_zts:0}%{?with_zts:1}
+%define		php_debug			%{!?debug:0}%{?debug:1}
 
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
@@ -319,7 +326,6 @@
 Summary(pl):	php jako program FastCGI
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Provides:	php-program = %{epoch}:%{version}-%{release}
 
 %description fcgi
 php as FastCGI program.
@@ -332,7 +338,6 @@
 Summary(pl):	php jako program CGI
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Provides:	php-program = %{epoch}:%{version}-%{release}
 
 %description cgi
 php as CGI program.
@@ -345,7 +350,6 @@
 Summary(pl):	php jako interpreter działający z linii poleceń
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Provides:	php-program = %{epoch}:%{version}-%{release}
 
 %description cli
 php as CLI interpreter.
@@ -353,6 +357,16 @@
 %description cli -l pl
 php jako interpreter działający z linii poleceń.
 
+%package program
+Summary:	/usr/bin/php symlink
+Group:		Development/Languages/PHP
+Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
+Provides:	php(program)
+Obsoletes:	php(program)
+
+%description program
+Package providing /usr/bin/php symlink to PHP CLI.
+
 %package common
 Summary:	Common files needed by both apache module and CGI
 Summary(pl):	Wspólne pliki dla modułu apache'a i programu CGI
@@ -362,12 +376,18 @@
 # because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit
 Requires:	glibc >= 6:2.3.5
 Requires:	sed >= 4.0
+Provides:	%{name}-libxml = %{epoch}:%{version}-%{release}
 Provides:	%{name}-session = %{epoch}:%{version}-%{release}
+Provides:	%{name}-simplexml = %{epoch}:%{version}-%{release}
+Provides:	%{name}-spl = %{epoch}:%{version}-%{release}
+Provides:	%{name}-standard = %{epoch}:%{version}-%{release}
 # FIXME: apache2 specific Provides
 Provides:	php-common(apache-modules-api) = %{apache_modules_api}
 Provides:	php(modules_api) = %{php_api_version}
 Provides:	php(zend_module_api) = %{zend_module_api}
 Provides:	php(zend_extension_api) = %{zend_extension_api}
+Provides:	php5(debug) = %{php_debug}
+Provides:	php5(thread-safety) = %{zend_zts}
 Obsoletes:	php-session < 3:4.2.1-2
 # for the posttrans scriptlet, conflicts because in vserver enviroinment rpm package is not installed.
 Conflicts:	rpm < 4.4.2-0.2
@@ -1566,7 +1586,6 @@
 fi
 PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL
 
-# Apache SAPIs should be last one listed here
 sapis="
 %if %{with fcgi}
 fcgi
@@ -1611,7 +1630,7 @@
 	--with-exec-dir=%{_bindir} \
 	--%{!?debug:dis}%{?debug:en}able-debug \
 	--enable-zend-multibyte \
-	--enable-maintainer-zts \
+	%{?with_zts:--enable-maintainer-zts} \
 	--enable-memory-limit \
 	--enable-bcmath=shared \
 	--enable-calendar=shared \
@@ -1790,6 +1809,9 @@
 %{__make} install-headers install-build install-modules install-programs \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
+# as of 5.0.5, phpextdist isn't installed by default
+install scripts/dev/phpextdist $RPM_BUILD_ROOT%{_bindir}
+
 # install CGI
 libtool --silent --mode=install install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php.cgi
 
@@ -2562,6 +2584,7 @@
 %if %{with fcgi}
 %files fcgi
 %defattr(644,root,root,755)
+%doc sapi/cgi/README.FastCGI
 %attr(755,root,root) %{_bindir}/php.fcgi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
 %endif
@@ -2574,10 +2597,13 @@
 %files cli
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/php.cli
-%attr(755,root,root) %{_bindir}/php
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini
 %{_mandir}/man1/php.1*
 
+%files program
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/php
+
 %files common
 %defattr(644,root,root,755)
 %doc php.ini-*
@@ -2598,14 +2624,14 @@
 %doc README.UNIX-BUILD-SYSTEM
 %doc README.EXT_SKEL README.SELF-CONTAINED-EXTENSIONS
 %doc CODING_STANDARDS
+%attr(755,root,root) %{_bindir}/phpextdist
 %attr(755,root,root) %{_bindir}/phpize
 %attr(755,root,root) %{_bindir}/php-config
 %attr(755,root,root) %{_libdir}/libphp_common.so
 %{_libdir}/libphp_common.la
 %{_includedir}/php
 %{_libdir}/php/build
-%{_mandir}/man1/phpize*
-%{_mandir}/man1/php-config*
+%{_mandir}/man1/*
 
 %files bcmath
 %defattr(644,root,root,755)
@@ -3015,6 +3041,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.467.2.21  2005/10/29 13:51:44  arekm
+- merge from HEAD
+
 Revision 1.467.2.20  2005/10/29 13:44:49  arekm
 - up to 5.1 rc4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.20&r2=1.467.2.21&f=u




More information about the pld-cvs-commit mailing list