SPECS: php.spec - add snapshot build support - add zts and mime_ma...

[glen]

Author: glen                         Date: Fri Oct 28 19:00:13 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add snapshot build support
- add zts and mime_magic bconds

---- Files affected:
SPECS:
   php.spec (1.502 -> 1.503) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.502 SPECS/php.spec:1.503
--- SPECS/php.spec:1.502	Thu Oct 27 17:28:11 2005
+++ SPECS/php.spec	Fri Oct 28 21:00:07 2005
@@ -36,6 +36,7 @@
 %bcond_without	mnogosearch	# without mnogosearch extension module
 %bcond_without	msession	# without msession extension module
 %bcond_without	mssql		# without MS SQL extension module
+%bcond_without	mime_magic		# without mime-magic module
 %bcond_without	odbc		# without ODBC extension module
 %bcond_without	openssl		# without OpenSSL support and OpenSSL extension (module)
 %bcond_without	pcre		# without PCRE extension module
@@ -52,6 +53,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
@@ -82,10 +84,13 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
 Version:	5.0.5
-Release:	12%{?with_hardening:hardened}
+#define	_snap 200510281645
+%define	_rel 12
+Release:	%{?_snap:12.11.%{_snap}.}%{_rel}%{?with_hardening:hardened}
 Epoch:		4
 Group:		Libraries
 License:	PHP
+#Source0:	http://snaps.php.net/%{name}5-STABLE-%{_snap}.tar.bz2
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
 # Source0-md5:	b5d4ca75bbb11ee5b830fa67213d9f7f
 Source1:	FAQ.%{name}
@@ -215,7 +220,7 @@
 %define		php_api_version		20031224
 %define		zend_module_api		20041030
 %define		zend_extension_api	220040412
-%define		zend_zts			1
+%define		zend_zts			%{!?with_zts:0}%{?with_zts:1}
 %define		php_debug			%{!?debug:0}%{?debug:1}
 
 %description
@@ -384,8 +389,8 @@
 Provides:	php(modules_api) = %{php_api_version}
 Provides:	php(zend_module_api) = %{zend_module_api}
 Provides:	php(zend_extension_api) = %{zend_extension_api}
-Provides:	php(debug) = %{php_debug}
-Provides:	php(thread-safety) = %{zend_zts}
+Provides:	php(debug:5) = %{php_debug}
+Provides:	php(thread-safety:5) = %{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
@@ -1471,7 +1476,7 @@
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%setup -q
+%setup -q %{?_snap:-n php5-STABLE-%{_snap}}
 # this patch is broken by design, breaks --enable-versioning for example
 # update: --enable-version is broken by itself, it disables dynamic modules.
 %patch0 -p1
@@ -1515,7 +1520,7 @@
 %endif
 %patch30 -p1
 %patch31 -p1
-%patch32 -p0
+%{!?_snap:%patch32 -p0}
 %patch33 -p1
 
 # conflict seems to be resolved by recode patches
@@ -1599,7 +1604,7 @@
 	--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
 	--with-exec-dir=%{_bindir} \
 	--%{!?debug:dis}%{?debug:en}able-debug \
-	--enable-maintainer-zts \
+	%{?with_zts:--enable-maintainer-zts} \
 	--enable-memory-limit \
 	--enable-bcmath=shared \
 	--enable-calendar=shared \
@@ -1660,7 +1665,7 @@
 	%{?with_ldap:--with-ldap=shared} \
 	--with-mcrypt=shared \
 	%{?with_mhash:--with-mhash=shared} \
-	--with-mime-magic=shared,/usr/share/file/magic.mime \
+	%{?with_mime_magic:--with-mime-magic=shared,/usr/share/file/magic.mime}%{!?with_mime_magic:--disable-mime-magic} \
 	%{?with_ming:--with-ming=shared} \
 	%{?with_mm:--with-mm} \
 	%{!?with_mnogosearch:--without-mnogosearch}%{?with_mnogosearch:--with-mnogosearch=shared,/usr} \
@@ -2759,10 +2764,12 @@
 %attr(755,root,root) %{extensionsdir}/mhash.so
 %endif
 
+%if %{with mime_magic}
 %files mime_magic
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mime_magic.ini
 %attr(755,root,root) %{extensionsdir}/mime_magic.so
+%endif
 
 %if %{with ming}
 %files ming
@@ -2992,6 +2999,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.503  2005/10/28 19:00:07  glen
+- add snapshot build support
+- add zts and mime_magic bconds
+
 Revision 1.502  2005/10/27 15:28:11  glen
 - add Provides php(debug) and php(thread-safety) provides in -common; rel 12
 
================================================================

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