Author: qboosh Date: Sat Dec 24 17:52:14 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- reenabled interbase module
- oracle module is gone; there is pdo_oci, not pdo_oracle
- release 4
---- Files affected:
SPECS:
php.spec (1.527 -> 1.528)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.527 SPECS/php.spec:1.528
--- SPECS/php.spec:1.527 Fri Dec 23 23:55:58 2005
+++ SPECS/php.spec Sat Dec 24 18:52:09 2005
@@ -10,8 +10,7 @@
# (existing only in php4):
# db, hyperwave, java, mcal, overload, qtdom
# and removed from php 5.1:
-# cpdf, dio, dbx, fam, mnogosearch, yp
-# what about interbase? it's still present, but disabled???
+# cpdf, dio, dbx, fam, mnogosearch, yp, oracle
# - mime_magic can't handle new "string/*" entries in magic.mime
# - make additional headers added by mail patch configurable
# - apply -hardened patch by default ?
@@ -25,10 +24,9 @@
%bcond_with hwapi # with Hw API support (BR:
proprietary libs)
%bcond_with interbase_inst # use InterBase install., not Firebird (BR:
proprietary libs)
%bcond_with oci8 # with Oracle oci8 extension module (BR:
proprietary libs)
-%bcond_with oracle # with oracle extension module (BR:
proprietary libs)
%bcond_without curl # without CURL extension module
%bcond_without imap # without IMAP extension module
-%bcond_with interbase # with InterBase extension module
+%bcond_without interbase # with InterBase extension module
%bcond_without ldap # without LDAP extension module
%bcond_without mhash # without mhash extension module
%bcond_without ming # without ming extension module
@@ -84,7 +82,7 @@
Summary(uk): PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ
ÓĹŇ×ĹŇŚ
Name: php
Version: 5.1.1
-%define _rel 3
+%define _rel 4
Release: %{_rel}%{?with_hardening:hardened}
Epoch: 4
Group: Libraries
@@ -907,19 +905,19 @@
Moduł PHP dodający obsługę funkcji ncurses (tylko do SAPI cli i cgi).
%package oci8
-Summary: Oracle 8 database module for PHP
-Summary(pl): Moduł bazy danych Oracle 8 dla PHP
+Summary: Oracle 8+ database module for PHP
+Summary(pl): Moduł bazy danych Oracle 8+ dla PHP
Group: Libraries
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Autoreq: false
%description oci8
-This is a dynamic shared object (DSO) for PHP that will add Oracle 7
-and Oracle 8 database support through Oracle8 Call-Interface (OCI8).
+This is a dynamic shared object (DSO) for PHP that will add Oracle 7,
+8, 9 and 10 database support through Oracle8 Call-Interface (OCI8).
%description oci8 -l pl
-Moduł PHP umożliwiający dostęp do bazy danych Oracle 7 i Oracle 8
+Moduł PHP umożliwiający dostęp do bazy danych Oracle 7, 8, 9 i 10
poprzez interfejs Oracle8 Call-Interface (OCI8).
%package odbc
@@ -959,21 +957,6 @@
Uwaga: to jest moduł eksperymentalny.
-%package oracle
-Summary: Oracle 7 database module for PHP
-Summary(pl): Moduł bazy danych Oracle 7 dla PHP
-Group: Libraries
-Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Autoreq: false
-
-%description oracle
-This is a dynamic shared object (DSO) for PHP that will add Oracle 7
-database support.
-
-%description oracle -l pl
-Moduł PHP umożliwiający dostęp do bazy danych Oracle 7.
-
%package pcntl
Summary: Process Control extension module for PHP
Summary(pl): Moduł Process Control dla PHP
@@ -1027,7 +1010,7 @@
%package pdo-dblib
Summary: PHP Data Objects (PDO) FreeTDS support
-Summary(pl): Moduł PHP Data Objects (PDO) z wsparciem do FreeTDS
+Summary(pl): Moduł PHP Data Objects (PDO) z obsługą FreeTDS
Group: Libraries
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -1043,7 +1026,7 @@
%package pdo-mysql
Summary: PHP Data Objects (PDO) MySQL support
-Summary(pl): Moduł PHP Data Objects (PDO) z wsparciem do MySQL
+Summary(pl): Moduł PHP Data Objects (PDO) z obsługą MySQL-a
Group: Libraries
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -1057,9 +1040,25 @@
Moduł dla PHP dodający obsługę baz danych MySQL za pośrednictwem
interfejsu PDO.
+%package pdo-oci
+Summary: PHP Data Objects (PDO) Oracle support
+Summary(pl): Moduł PHP Data Objects (PDO) z obsługą Oracle'a
+Group: Libraries
+Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
+
+%description pdo-oci
+This is a dynamic shared object (DSO) for PHP that will add PDO Oracle
+support.
+
+%description pdo-oci -l pl
+Moduł dla PHP dodający obsługę baz danych Oracle za pośrednictwem
+interfejsu PDO.
+
%package pdo-odbc
Summary: PHP Data Objects (PDO) ODBC support
-Summary(pl): Moduł PHP Data Objects (PDO) z wsparciem do ODBC
+Summary(pl): Moduł PHP Data Objects (PDO) z obsługą ODBC
Group: Libraries
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -1075,7 +1074,7 @@
%package pdo-pgsql
Summary: PHP Data Objects (PDO) PostgreSQL support
-Summary(pl): Moduł PHP Data Objects (PDO) z wsparciem do PostgreSQL
+Summary(pl): Moduł PHP Data Objects (PDO) z obsługą PostgreSQL-a
Group: Libraries
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -1091,7 +1090,7 @@
%package pdo-sqlite
Summary: PHP Data Objects (PDO) SQLite support
-Summary(pl): Moduł PHP Data Objects (PDO) z wsparciem do SQLite
+Summary(pl): Moduł PHP Data Objects (PDO) z obsługą SQLite
Group: Libraries
Requires(post,preun): %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -1657,7 +1656,7 @@
--with-pdo-firebird=shared \
%endif
--with-pdo-mysql=shared \
- %{?with_oracle:--with-pdo-oci=shared} \
+ %{?with_oci8:--with-pdo-oci=shared} \
%{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
%{?with_pgsql:--with-pdo-pgsql=shared} \
%{?with_sqlite:--with-pdo-sqlite=shared} \
@@ -1715,7 +1714,6 @@
%{?with_oci8:--with-oci8=shared} \
%{?with_openssl:--with-openssl=shared} \
--with-kerberos \
- %{?with_oracle:--with-oracle=shared} \
%{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=shared,/usr} \
--with-pear=%{php_pear_dir} \
%{!?with_pgsql:--without-pgsql}%{?with_pgsql:--with-pgsql=shared,/usr} \
@@ -2189,12 +2187,6 @@
%postun openssl
%extension_postun
-%post oracle
-%extension_post
-
-%postun oracle
-%extension_postun
-
%post pcntl
if [ -f %{_sysconfdir}/php-cgi.ini ]; then
%{_sbindir}/php-module-install install pcntl %{_sysconfdir}/php-cgi.ini
@@ -2504,9 +2496,6 @@
%triggerun openssl -- %{name}-openssl < 4:5.0.4-9.1
[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install
remove openssl %{_sysconfdir}/php.ini
-%triggerun oracle -- %{name}-oracle < 4:5.0.4-9.1
-[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install
remove oracle %{_sysconfdir}/php.ini
-
%triggerun pcre -- %{name}-pcre < 4:5.0.4-9.1
[ ! -x %{_sbindir}/php-module-install ] || %{_sbindir}/php-module-install
remove pcre %{_sysconfdir}/php.ini
@@ -2838,13 +2827,6 @@
%attr(755,root,root) %{extensionsdir}/openssl.so
%endif
-%if %{with oracle}
-%files oracle
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oracle.ini
-%attr(755,root,root) %{extensionsdir}/oracle.so
-%endif
-
%files pcntl
%defattr(644,root,root,755)
%attr(755,root,root) %{extensionsdir}/pcntl.so
@@ -2873,11 +2855,11 @@
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/pdo_mysql.ini
%attr(755,root,root) %{extensionsdir}/pdo_mysql.so
-%if %{with oracle}
-%files pdo-oracle
+%if %{with oci8}
+%files pdo-oci
%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/pdo_oracle.ini
-%attr(755,root,root) %{extensionsdir}/pdo_oracle.so
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/pdo_oci.ini
+%attr(755,root,root) %{extensionsdir}/pdo_oci.so
%endif
%if %{with odbc}
@@ -3054,6 +3036,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.528 2005/12/24 17:52:09 qboosh
+- reenabled interbase module
+- oracle module is gone; there is pdo_oci, not pdo_oracle
+- release 4
+
Revision 1.527 2005/12/23 22:55:58 qboosh
- one more module removed in 5.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.527&r2=1.528&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
