[packages/php] cleanup removed sybase-ct extension
glen
glen at pld-linux.org
Sun Sep 27 21:17:55 CEST 2015
commit 83f22a2d3bb247e771973cb82377ea242d183ccf
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Sep 27 22:15:54 2015 +0300
cleanup removed sybase-ct extension
php-tds.patch | 11 -----------
php.spec | 33 +--------------------------------
2 files changed, 1 insertion(+), 43 deletions(-)
---
diff --git a/php.spec b/php.spec
index 818cbe6..0eb2225 100644
--- a/php.spec
+++ b/php.spec
@@ -101,7 +101,6 @@
%bcond_without snmp # without SNMP extension module
%bcond_without sqlite2 # without SQLite extension module
%bcond_without sqlite3 # without SQLite3 extension module
-%bcond_with sybase_ct # without Sybase-CT extension module (ext removed in 7.0.0)
%bcond_without tidy # without Tidy extension module
%bcond_without wddx # without WDDX extension module
%bcond_without xmlrpc # without XML-RPC extension module
@@ -197,7 +196,6 @@ Patch27: %{orgname}-config-dir.patch
Patch29: %{orgname}-fcgi-graceful.patch
Patch31: %{orgname}-fcgi-error_log-no-newlines.patch
Patch34: %{orgname}-libtool.patch
-Patch35: %{orgname}-tds.patch
#Patch36: %{orgname}-mysql-charsetphpini.patch
#Patch37: %{orgname}-mysqli-charsetphpini.patch
#Patch38: %{orgname}-pdo_mysql-charsetphpini.patch
@@ -241,7 +239,7 @@ BuildRequires: elfutils-devel
%{!?with_mysqlnd:BuildRequires: mysql-devel}
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
-%if %{with sybase_ct} || %{with pdo_dblib}
+%if %{with pdo_dblib}
BuildRequires: freetds-devel >= 0.82
%endif
BuildRequires: freetype-devel >= 1:2.5.1
@@ -1681,24 +1679,6 @@ baz danych. SQLite sam jest serwerem. Biblioteka SQLite czyta i
zapisuje dane bezpośrednio z/do plików baz danych znajdujących się na
dysku.
-%package sybase-ct
-Summary: Sybase-CT extension module for PHP
-Summary(pl.UTF-8): Moduł Sybase-CT dla PHP
-Group: Libraries
-URL: http://www.php.net/manual/en/book.sybase.php
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Provides: php(sybase-ct)
-Obsoletes: php-sybase
-Obsoletes: php-sybase-ct < 4:5.3.28-7
-
-%description sybase-ct
-This is a dynamic shared object (DSO) for PHP that will add Sybase and
-MS SQL databases support through CT-lib.
-
-%description sybase-ct -l pl.UTF-8
-Moduł PHP dodający obsługę baz danych Sybase oraz MS SQL poprzez
-CT-lib.
-
%package sysvmsg
Summary: SysV msg extension module for PHP
Summary(pl.UTF-8): Moduł SysV msg dla PHP
@@ -1978,7 +1958,6 @@ cp -p php.ini-production php.ini
%if "%{pld_release}" != "ac"
%patch34 -p1
%endif
-%{?with_sybase_ct:%patch35 -p1}
#%patch36 -p1
#%patch37 -p1
#%patch38 -p1
@@ -2368,7 +2347,6 @@ for sapi in $sapis; do
%{?with_recode:--with-recode=shared} \
%{__with_without ereg regex system} \
%{?with_snmp:--with-snmp=shared} \
- %{?with_sybase_ct:--with-sybase-ct=shared,/usr} \
%{!?with_pdo_sqlite:--without-pdo-sqlite} \
%{__with_without sqlite3 sqlite3 shared,/usr} \
%{?with_tidy:--with-tidy=shared} \
@@ -2820,7 +2798,6 @@ fi
%extension_scripts sockets
%extension_scripts spl
%extension_scripts sqlite3
-%extension_scripts sybase-ct
%extension_scripts sysvmsg
%extension_scripts sysvsem
%extension_scripts sysvshm
@@ -3356,14 +3333,6 @@ fi
%attr(755,root,root) %{php_extensiondir}/sqlite3.so
%endif
-%if %{with sybase_ct}
-%files sybase-ct
-%defattr(644,root,root,755)
-%doc ext/sybase_ct/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sybase_ct.ini
-%attr(755,root,root) %{php_extensiondir}/sybase_ct.so
-%endif
-
%files sysvmsg
%defattr(644,root,root,755)
%doc ext/sysvmsg/CREDITS
diff --git a/php-tds.patch b/php-tds.patch
deleted file mode 100644
index ef036a7..0000000
--- a/php-tds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- php-5.3.3/ext/sybase_ct/config.m4~ 2010-07-07 13:15:24.000000000 +0300
-+++ php-5.3.3/ext/sybase_ct/config.m4 2010-07-24 19:21:13.897144810 +0300
-@@ -31,7 +31,7 @@
- fi
-
- PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
-- if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
-+ if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h || test -f $SYBASE_CT_INCDIR/sybdb.h; then
- PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
- elif test -f $SYBASE_CT_INCDIR/libsybct64; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/83f22a2d3bb247e771973cb82377ea242d183ccf
More information about the pld-cvs-commit
mailing list