From: Adam Gołębiowski <adamg@pld-linux.org>
Date: Fri, 13 Aug 2004 19:49:41 +0000 (+0000)
Subject: - separate sybase and sybase_ct modules - first one is broken (dunno why)
X-Git-Tag: auto/ac/php-5_0_2-1~9
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=4cc60252b5ed3141880acf776a9d3e799b6a9b91;p=packages%2Fphp.git

- separate sybase and sybase_ct modules - first one is broken (dunno why)
- release 0.2

Changed files:
    php.spec -> 1.348
---

diff --git a/php.spec b/php.spec
index 3012f62..2ab5684 100644
--- a/php.spec
+++ b/php.spec
@@ -42,6 +42,7 @@
 %bcond_without	simplexml	# without simplexml extension module
 %bcond_without	snmp		# without SNMP extension module
 %bcond_without	sqlite		# without SQLite extension module
+%bcond_without	sybase_ct	# without Sybase-CT extension module
 %bcond_without	tidy		# without Tidy extension module
 %bcond_without	wddx		# without WDDX extension module
 %bcond_without	xmlrpc		# without XML-RPC extension module
@@ -52,7 +53,7 @@
 %bcond_with	mono		# without Mono extensions module
 %bcond_with	yaz		# without YAZ extension module
 # Breaks build
-%bcond_with	sybase		# without Sybase and Sybase-CT extension modules
+%bcond_with	sybase		# without Sybase extension module
 #
 %define	_apache2	%(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 1 || echo 0)
 %define	apxs		/usr/sbin/apxs
@@ -76,7 +77,7 @@ Summary(ru):	PHP 
 Summary(uk):	PHP ÷ÅÒÓ¦§ 5 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:		php
 Version:	5.0.1
-Release:	0.1
+Release:	0.2
 Epoch:		3
 Group:		Libraries
 License:	PHP
@@ -138,7 +139,7 @@ BuildRequires:	expat-devel
 %{?with_fdf:BuildRequires:	fdftk-devel}
 BuildRequires:	fcgi-devel
 BuildRequires:	flex
-%if %{with mssql} || %{with sybase}
+%if %{with mssql} || %{with sybase} || %{with sybase_ct}
 BuildRequires:	freetds-devel
 %endif
 BuildRequires:	freetype-devel >= 2.0
@@ -1566,7 +1567,8 @@ for i in fcgi cgi cli apxs ; do
 	--with-regex=php \
 	--without-sablot-js \
 	%{?with_snmp:--with-snmp=shared} \
-	%{?with_sybase:--with-sybase-ct=shared,/usr --with-sybase=shared,/usr} \
+	%{?with_sybase:--with-sybase=shared,/usr} \
+	%{?with_sybase_ct:--with-sybase-ct=shared,/usr} \
 	%{?with_sqlite:--with-sqlite=shared,/usr} \
 	--with-t1lib=shared \
 	%{?with_tidy:--with-tidy=shared} \
@@ -1579,6 +1581,8 @@ for i in fcgi cgi cli apxs ; do
 	--with-zlib=shared \
 	--with-zlib-dir=shared,/usr
 
+#	%{?with_sybase:--with-sybase-ct=shared,/usr --with-sybase=shared,/usr} \
+
 cp -f Makefile Makefile.$i
 # left for debugging purposes
 cp -f main/php_config.h php_config.h.$i