update to 11.1.0.7

add tools sub-package

1 files changed, 51 insertions, 48 deletions

diff --git a/oracle-instantclient.spec b/oracle-instantclient.spec
index f368f08..d2351c1 100644
--- a/oracle-instantclient.spec
+++ b/oracle-instantclient.spec
@@ -1,6 +1,6 @@
-# remirepo/fedora spec file for oracle-instantclient/x86_64
+# remirepo/fedora spec file for oracle-instantclient
 #
-# Copyright (c) 2006-2019 Remi Collet
+# Copyright (c) 2006-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,29 +10,29 @@
 %global __arch_install_post /bin/true
 %global _build_id_links none
 
-%global major   19
-%global mainver 19.9
-%global libclnt 19.1
-%global topdir	instantclient_19_9
+%global major   21
+%global mainver 21.1
+%global libclnt 21.1
+%global topdir	instantclient_21_1
 %global oradir	%{_libdir}/oracle/%{mainver}/client64
 %global incdir	%{_includedir}/oracle/%{mainver}/client64
 
 
 Summary: 	Instant Client for Oracle Database %{major}
-Name: 		oracle-instantclient-x86_64
-Version: 	19.9.0.0.0
+Name: 		oracle-instantclient
+Version: 	21.1.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.x64-%{version}dbru.zip
-Source1:	instantclient-jdbc-linux.x64-%{version}dbru.zip
-Source2:	instantclient-odbc-linux.x64-%{version}dbru.zip
-Source3:	instantclient-sdk-linux.x64-%{version}dbru.zip
-Source4:	instantclient-sqlplus-linux.x64-%{version}dbru.zip
-Source5:	instantclient-tools-linux.x64-%{version}dbru.zip
-Source6:	instantclient-precomp-linux.x64-%{version}dbru.zip
+Source0:	instantclient-basic-linux.x64-%{version}.zip
+Source1:	instantclient-jdbc-linux.x64-%{version}.zip
+Source2:	instantclient-odbc-linux.x64-%{version}.zip
+Source3:	instantclient-sdk-linux.x64-%{version}.zip
+Source4:	instantclient-sqlplus-linux.x64-%{version}.zip
+Source5:	instantclient-tools-linux.x64-%{version}.zip
+Source6:	instantclient-precomp-linux.x64-%{version}.zip
 #NoSource:       0
 #NoSource:       1
 #NoSource:       2
@@ -51,68 +51,68 @@ and JDBC-OCI applications.
 Oracle Call Interface %{mainver} can connect to Oracle Database 11.2 or later.
 
 
-%package -n oracle-instantclient-basic
+%package basic
 Summary:	Instant Client for Oracle Database 11g
 Group:		Applications/File
 
-%description -n oracle-instantclient-basic
+%description basic
 Base files for Instant Client.  Support for OCI, OCCI,
 and JDBC-OCI applications.
 
-%package -n oracle-instantclient-devel
+%package devel
 Summary:	Development headers for Instant Client
 Group:		Applications/File
 Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
-%description -n oracle-instantclient-devel
+%description devel
 Additional header files and an example Makefile for developing Oracle
 applications with Instant Client.
 
-%package -n oracle-instantclient-jdbc
+%package jdbc
 Summary: 	Supplemental JDBC features under Instant Client
 Group:		Applications/File
 Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
-%description -n oracle-instantclient-jdbc
+%description jdbc
 Additional support for XA, Internationalization,
 and RowSet operations under JDBC.
 
-%package -n oracle-instantclient-odbc
+%package odbc
 Summary: 	Oracle  ODBC Instant Client for Linux
 Group:		Applications/File
 Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
-%description -n oracle-instantclient-odbc
+%description odbc
 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.
 
-%package -n oracle-instantclient-sqlplus
+%package sqlplus
 Summary:	SQL*Plus for Instant Client
 Group:		Applications/File
 Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
-%description -n oracle-instantclient-sqlplus
+%description sqlplus
 Additional libraries and executable for running
 SQL*Plus with Instant Client.
 
-%package -n oracle-instantclient-tools
+%package tools
 Summary:	Tools for Oracle Database 11g
 Group:		Applications/File
 Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
-%description -n oracle-instantclient-tools
+%description tools
 This package provides tools to be used with the Oracle Database.
 It currently includes
 - wrc : a client to be used with the Database Replay feature
 
-%package -n oracle-instantclient-precomp
+%package precomp
 Summary:	Oracle Precompilers for Pro*C and Pro*COBOL
 Group:		Applications/File
 Requires: 	oracle-instantclient-devel%{?_isa} = %version
 
-%description -n oracle-instantclient-precomp
+%description precomp
 PRECOMP Instant Client (IC) Package contains following
 components:
   i) "proc" binary to precompile a Pro*C application
@@ -151,11 +151,9 @@ 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
-install -p libipc1.so				%{buildroot}%{oradir}/lib
-install -p libmql1.so				%{buildroot}%{oradir}/lib
 install -p libociei.so				%{buildroot}%{oradir}/lib
 install -p libocijdbc%{major}.so	%{buildroot}%{oradir}/lib
-install -p liboramysql%{major}.so	%{buildroot}%{oradir}/lib
+install -p liboramysql.so	%{buildroot}%{oradir}/lib
 install -p ojdbc8.jar		%{buildroot}%{oradir}/lib
 install -p xstreams.jar		%{buildroot}%{oradir}/lib
 
@@ -194,7 +192,9 @@ for cmd in exp expdp imp impdp sqlldr wrc; do
   install -p $cmd           %{buildroot}%{oradir}/bin/$cmd
   ln -sf %{oradir}/bin/$cmd %{buildroot}%{_bindir}/$cmd
 done
-install -p libnfsodm%{major}.so   %{buildroot}%{oradir}/lib
+install -p libnfsodm.so   %{buildroot}%{oradir}/lib
+install -p libomsodm.so   %{buildroot}%{oradir}/lib
+install -p libopcodm.so   %{buildroot}%{oradir}/lib
 
 # Precomp
 # NOTICE: don't install rtsora - broken dep on  libcobcrtn64.so
@@ -218,15 +218,15 @@ fi
 done
 
 
-%post   -n oracle-instantclient-basic   -p /sbin/ldconfig
-%postun -n oracle-instantclient-basic   -p /sbin/ldconfig
-%post   -n oracle-instantclient-sqlplus -p /sbin/ldconfig
-%postun -n oracle-instantclient-sqlplus -p /sbin/ldconfig
+%post   basic   -p /sbin/ldconfig
+%postun basic   -p /sbin/ldconfig
+%post   sqlplus -p /sbin/ldconfig
+%postun sqlplus -p /sbin/ldconfig
 
 
 %{!?_licensedir:%global license %%doc}
 
-%files -n oracle-instantclient-basic
+%files basic
 %license %{topdir}/BASIC_LICENSE
 %doc %{topdir}/BASIC_README
 %dir %{oradir}
@@ -236,11 +236,9 @@ done
 %{oradir}/lib/libclntsh.so.%{libclnt}
 %{oradir}/lib/libnnz%{major}.so
 %{oradir}/lib/libocci.so.%{libclnt}
-%{oradir}/lib/libipc1.so
-%{oradir}/lib/libmql1.so
 %{oradir}/lib/libociei.so
 %{oradir}/lib/libocijdbc%{major}.so
-%{oradir}/lib/liboramysql%{major}.so
+%{oradir}/lib/liboramysql.so
 %{oradir}/lib/ojdbc8.jar
 %{oradir}/lib/xstreams.jar
 %{_sysconfdir}/ld.so.conf.d/%{name}.conf
@@ -248,7 +246,7 @@ done
 %{oradir}/bin/adrci
 %{oradir}/bin/uidrvci
 
-%files -n oracle-instantclient-devel -f %{topdir}/devel.files
+%files devel -f %{topdir}/devel.files
 %license %{topdir}/SDK_LICENSE
 %doc %{topdir}/sdk/demo %{topdir}/SDK_README %{topdir}/sdk/ott
 %{oradir}/lib/libclntshcore.so
@@ -259,7 +257,7 @@ done
 %{_bindir}/ott
 %{oradir}/bin/ott
 
-%files -n oracle-instantclient-sqlplus
+%files sqlplus
 %license %{topdir}/SQLPLUS_LICENSE
 %doc %{topdir}/SQLPLUS_README
 %{_bindir}/sqlplus
@@ -268,21 +266,21 @@ done
 %{oradir}/lib/libsqlplus.so
 %{oradir}/lib/libsqlplusic.so
 
-%files -n oracle-instantclient-jdbc
+%files jdbc
 %license %{topdir}/JDBC_LICENSE
 %doc %{topdir}/JDBC_README
 %{oradir}/lib/libheteroxa%{major}.so
 %{oradir}/lib/orai18n-mapping.jar
 %{oradir}/lib/orai18n.jar
 
-%files -n oracle-instantclient-odbc
+%files odbc
 %license %{topdir}/ODBC_LICENSE
 %doc %{topdir}/ODBC_README
 %doc %{topdir}/odbc_update_ini.sh
 %doc %{topdir}/help
 %{oradir}/lib/libsqora.so.%{libclnt}
 
-%files -n oracle-instantclient-tools
+%files tools
 %license %{topdir}/TOOLS_LICENSE
 %doc %{topdir}/TOOLS_README
 %{_bindir}/exp
@@ -297,9 +295,11 @@ done
 %{oradir}/bin/impdp
 %{oradir}/bin/sqlldr
 %{oradir}/bin/wrc
-%{oradir}/lib/libnfsodm%{major}.so
+%{oradir}/lib/libnfsodm.so
+%{oradir}/lib/libomsodm.so
+%{oradir}/lib/libopcodm.so
 
-%files -n oracle-instantclient-precomp -f %{topdir}/precomp.files
+%files precomp -f %{topdir}/precomp.files
 %doc %{topdir}/sdk/demo %{topdir}/PRECOMP_README
 %dir %{oradir}/lib/precomp
 %dir %{oradir}/lib/precomp/admin
@@ -313,6 +313,9 @@ done
 
 
 %changelog
+* Mon Feb  8 2021 Remi Collet <remi@remirepo.net> 21.1.0.0.0-1
+- update to 21.1.0.0.0
+
 * Tue Nov 17 2020 Remi Collet <remi@remirepo.net> 19.9.0.0.0-1
 - update to 19.9.0.0.0