summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--oracle-instantclient.spec83
-rw-r--r--sources14
3 files changed, 70 insertions, 34 deletions
diff --git a/.gitignore b/.gitignore
index 54e154f..0ba9a93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,10 @@
/instantclient-sdk-linux.arm64-19.23.0.0.0dbru.zip
/instantclient-sqlplus-linux.arm64-19.23.0.0.0dbru.zip
/instantclient-tools-linux.arm64-19.23.0.0.0dbru.zip
+/instantclient-basic-linux.x64-21.14.0.0.0dbru.zip
+/instantclient-jdbc-linux.x64-21.14.0.0.0dbru.zip
+/instantclient-odbc-linux.x64-21.14.0.0.0dbru.zip
+/instantclient-precomp-linux.x64-21.14.0.0.0dbru.zip
+/instantclient-sdk-linux.x64-21.14.0.0.0dbru.zip
+/instantclient-sqlplus-linux.x64-21.14.0.0.0dbru.zip
+/instantclient-tools-linux.x64-21.14.0.0.0dbru.zip
diff --git a/oracle-instantclient.spec b/oracle-instantclient.spec
index 5763d9a..66d97ce 100644
--- a/oracle-instantclient.spec
+++ b/oracle-instantclient.spec
@@ -10,53 +10,53 @@
%global __arch_install_post /bin/true
%global _build_id_links none
+%ifarch x86_64 noarch
+%global major 21
+%global mainver 21.14
+%global libclnt 21.1
+%define topdir instantclient_%(echo %mainver|tr '.' '_')
+%global archsuf x64
+%else
%global major 19
-%global mainver 19.23
+%global mainver 19.22
%global libclnt 19.1
-%global topdir instantclient_19_23
+%define topdir instantclient_%(echo %mainver|tr '.' '_')
+%global archsuf arm64
+%endif
%global oradir %{_libdir}/oracle/%{mainver}/client64
%global incdir %{_includedir}/oracle/%{mainver}/client64
%global tarsuf dbru
-
Summary: Instant Client for Oracle Database %{major}
Name: oracle-instantclient
Version: %{mainver}.0.0.0
Release: 1%{?dist}
License: Oracle
Group: Applications/File
-Url: http://www.oracle.com/technology/software/tech/oci/instantclient/index.html
-
-Source0: instantclient-basic-linux.arm64-%{version}%{?tarsuf}.zip
-Source1: instantclient-jdbc-linux.arm64-%{version}%{?tarsuf}.zip
-Source2: instantclient-odbc-linux.arm64-%{version}%{?tarsuf}.zip
-Source3: instantclient-sdk-linux.arm64-%{version}%{?tarsuf}.zip
-Source4: instantclient-sqlplus-linux.arm64-%{version}%{?tarsuf}.zip
-Source5: instantclient-tools-linux.arm64-%{version}%{?tarsuf}.zip
-Source6: instantclient-precomp-linux.arm64-%{version}%{?tarsuf}.zip
-#NoSource: 0
-#NoSource: 1
-#NoSource: 2
-#NoSource: 3
-#NoSource: 4
-#NoSource: 5
-#NoSource: 6
-ExclusiveArch: aarch64
+Url: https://www.oracle.com/database/technologies/instant-client.html
+Source0: instantclient-basic-linux.%{archsuf}-%{version}%{?tarsuf}.zip
+Source1: instantclient-jdbc-linux.%{archsuf}-%{version}%{?tarsuf}.zip
+Source2: instantclient-odbc-linux.%{archsuf}-%{version}%{?tarsuf}.zip
+Source3: instantclient-sdk-linux.%{archsuf}-%{version}%{?tarsuf}.zip
+Source4: instantclient-sqlplus-linux.%{archsuf}-%{version}%{?tarsuf}.zip
+Source5: instantclient-tools-linux.%{archsuf}-%{version}%{?tarsuf}.zip
+Source6: instantclient-precomp-linux.%{archsuf}-%{version}%{?tarsuf}.zip
+
+BuildArch: x86_64 aarch64
BuildRequires: chrpath
%description
-Base files for Instant Client. Support for OCI, OCCI,
+Base files for Instant Client. Support for OCI, OCCI,
and JDBC-OCI applications.
Oracle Call Interface %{mainver} can connect to Oracle Database 11.2 or later.
-
%package basic
Summary: Instant Client for Oracle Database 11g
Group: Applications/File
%description basic
-Base files for Instant Client. Support for OCI, OCCI,
+Base files for Instant Client. Support for OCI, OCCI,
and JDBC-OCI applications.
%package devel
@@ -78,12 +78,12 @@ Additional support for XA, Internationalization,
and RowSet operations under JDBC.
%package odbc
-Summary: Oracle ODBC Instant Client for Linux
+Summary: Oracle ODBC Instant Client for Linux
Group: Applications/File
Requires: oracle-instantclient-basic%{?_isa} = %version
%description odbc
-Oracle ODBC Instant Client for Linux complies with
+Oracle ODBC Instant Client for Linux complies with
ODBC 3.52 specifications. It is based on features of
Oracle %{version} ODBC driver for Windows, without
the need for a traditional ORACLE_HOME installation.
@@ -121,7 +121,6 @@ iii) sample configuration files, demo programs and demo
make files for building proc and procob demos and
in general any Pro*C/Pro*COBOL application.
-
%prep
rm -rf %{topdir}
@@ -147,13 +146,21 @@ mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
install -p adrci %{buildroot}%{oradir}/bin
install -p genezi %{buildroot}%{oradir}/bin
install -p uidrvci %{buildroot}%{oradir}/bin
-chrpath -d %{buildroot}%{oradir}/bin/*
+chrpath -d %{buildroot}%{oradir}/bin/{adrci,genezi,uidrvci}
install -p libclntshcore.so.%{libclnt} %{buildroot}%{oradir}/lib
install -p libclntsh.so.%{libclnt} %{buildroot}%{oradir}/lib
install -p libnnz%{major}.so %{buildroot}%{oradir}/lib
install -p libocci.so.%{libclnt} %{buildroot}%{oradir}/lib
+%if "%{major}" >= "21"
+install -p libocci_gcc53.so.%{libclnt} %{buildroot}%{oradir}/lib
+%endif
install -p libociei.so %{buildroot}%{oradir}/lib
install -p libocijdbc%{major}.so %{buildroot}%{oradir}/lib
+%if "%{major}" >= "21"
+install -p liboramysql.so %{buildroot}%{oradir}/lib
+%else
+install -p liboramysql%{major}.so %{buildroot}%{oradir}/lib
+%endif
install -p ojdbc8.jar %{buildroot}%{oradir}/lib
install -p xstreams.jar %{buildroot}%{oradir}/lib
@@ -166,6 +173,9 @@ install -p -m 755 sdk/ott %{buildroot}%{oradir}/bin
ln -s %{oradir}/bin/ott %{buildroot}%{_bindir}/ott
ln -s libocci.so.%{libclnt} %{buildroot}%{oradir}/lib/libocci.so
+%if "%{major}" >= "21"
+ln -s libocci_gcc53.so.%{libclnt} %{buildroot}%{oradir}/lib/libocci_gcc53.so
+%endif
ln -s libclntsh.so.%{libclnt} %{buildroot}%{oradir}/lib/libclntsh.so
ln -s libclntshcore.so.%{libclnt} %{buildroot}%{oradir}/lib/libclntshcore.so
@@ -194,6 +204,10 @@ for cmd in exp expdp imp impdp sqlldr wrc; do
chrpath -d %{buildroot}%{oradir}/bin/$cmd
ln -sf %{oradir}/bin/$cmd %{buildroot}%{_bindir}/$cmd
done
+%if "%{major}" >= "21"
+install -p libnfsodm.so %{buildroot}%{oradir}/lib
+install -p libopcodm.so %{buildroot}%{oradir}/lib
+%endif
# Precomp
# NOTICE: don't install rtsora - broken dep on libcobcrtn64.so
@@ -237,8 +251,16 @@ chrpath -d %{buildroot}%{oradir}/lib/*.so*
%{oradir}/lib/libclntsh.so.%{libclnt}
%{oradir}/lib/libnnz%{major}.so
%{oradir}/lib/libocci.so.%{libclnt}
+%if "%{major}" >= "21"
+%{oradir}/lib/libocci_gcc53.so.%{libclnt}
+%endif
%{oradir}/lib/libociei.so
%{oradir}/lib/libocijdbc%{major}.so
+%if "%{major}" >= "21"
+%{oradir}/lib/liboramysql.so
+%else
+%{oradir}/lib/liboramysql%{major}.so
+%endif
%{oradir}/lib/ojdbc8.jar
%{oradir}/lib/xstreams.jar
%{_sysconfdir}/ld.so.conf.d/%{name}.conf
@@ -252,6 +274,9 @@ chrpath -d %{buildroot}%{oradir}/lib/*.so*
%{oradir}/lib/libclntshcore.so
%{oradir}/lib/libclntsh.so
%{oradir}/lib/libocci.so
+%if "%{major}" >= "21"
+%{oradir}/lib/libocci_gcc53.so
+%endif
%{oradir}/lib/ottclasses.zip
%dir %{incdir}
%{_bindir}/ott
@@ -295,6 +320,10 @@ chrpath -d %{buildroot}%{oradir}/lib/*.so*
%{oradir}/bin/impdp
%{oradir}/bin/sqlldr
%{oradir}/bin/wrc
+%if "%{major}" >= "21"
+%{oradir}/lib/libnfsodm.so
+%{oradir}/lib/libopcodm.so
+%endif
%files precomp -f %{topdir}/precomp.files
%doc %{topdir}/sdk/demo %{topdir}/PRECOMP_README
diff --git a/sources b/sources
index 5dc8c4c..6777fe3 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,7 @@
-0b33f60ae2cf32732aacf4d0b69782aa instantclient-basic-linux.arm64-19.23.0.0.0dbru.zip
-45fbd7f1b52b7879e037c87e99bbbdfb instantclient-jdbc-linux.arm64-19.23.0.0.0dbru.zip
-89297fd7d9e1ff401833149f383d239b instantclient-odbc-linux.arm64-19.23.0.0.0dbru.zip
-41edca2d8cbde36639bc21231dc2d274 instantclient-precomp-linux.arm64-19.23.0.0.0dbru.zip
-d427db985d474915db217172db67b6b9 instantclient-sdk-linux.arm64-19.23.0.0.0dbru.zip
-dece931f92abb7d0f2eff3a98ae87e45 instantclient-sqlplus-linux.arm64-19.23.0.0.0dbru.zip
-fed2a7cd7b514bcead776959945b01c1 instantclient-tools-linux.arm64-19.23.0.0.0dbru.zip
+acaa2ea074d050cca09f51686925478f instantclient-basic-linux.x64-21.14.0.0.0dbru.zip
+0647723aa5f9dbc90c631c64b5885306 instantclient-jdbc-linux.x64-21.14.0.0.0dbru.zip
+12febfa3f5de3d7d3c1b84f2452606bb instantclient-odbc-linux.x64-21.14.0.0.0dbru.zip
+4fa4a642c3c0d1dbe251e727bcf352c9 instantclient-precomp-linux.x64-21.14.0.0.0dbru.zip
+d004b2ea09cf34f7b2185c75d0be960e instantclient-sdk-linux.x64-21.14.0.0.0dbru.zip
+e7908da233f962473f57bb48389beb77 instantclient-sqlplus-linux.x64-21.14.0.0.0dbru.zip
+a8d4a79ae97710e2a1072bf3115b4cee instantclient-tools-linux.x64-21.14.0.0.0dbru.zip