v18.5.0.0.0 (x86_64)

7 files changed, 48 insertions, 779 deletions

diff --git a/.gitignore b/.gitignore
index a23295c..f298d13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 12.1.*
 12.2.*
 18.3.*
+18.5.*
 instant*.zip
 oracle-*.rpm
diff --git a/Makefile b/Makefile
index ce2c935..f28cae5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 SRCDIR := $(shell pwd)
-NAME := oracle-instantclient-18.3
+NAME := oracle-instantclient-18
 
 RPMDEFINES := --define "_sourcedir $(SRCDIR)" \
               --define "_specdir $(SRCDIR)" \
diff --git a/README b/README
index d377b98..cc4b19f 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ Spec file to build Oracle Instant Client
 RPM can't be published but are used to build php-oci8, tora, ...
 
 Download .zip files from:
-http://www.oracle.com/technology/software/tech/oci/instantclient/index.html
+https://www.oracle.com/technetwork/database/database-technologies/instant-client/downloads/index.html
 
 
 One spec file per version / architecture, as upstream sometime release them
@@ -22,4 +22,5 @@ Differences with upstream packages:
   is not supported, so does not make sense
 - auto provides/requires enabled
 - rtsora not packaged (missing dependency on libcobcrtn64.so)
+- license in /usr/share/licenses
 
diff --git a/oracle-instantclient-12.1-i386.spec b/oracle-instantclient-12.1-i386.spec
deleted file mode 100644
index 9b6ff32..0000000
--- a/oracle-instantclient-12.1-i386.spec
+++ /dev/null
@@ -1,358 +0,0 @@
-# SPEC file for i386 version of
-# oracle-instantclient-basic
-# oracle-instantclient-devel
-# oracle-instantclient-sqlplus
-# oracle-instantclient-jdbc
-# oracle-instantclient-odbc
-# oracle-instantclient-tools
-# oracle-instantclient-precomp
-
-%define __arch_install_post /bin/true
-
-%global major   12
-%global mainver 12.1
-
-Summary: 	Instant Client for Oracle Database 11g
-Name: 		oracle-instantclient-i386
-Version: 	12.1.0.2.0
-Release:	3%{?dist}
-License:	Oracle
-Group:		Applications/File
-Url:		http://www.oracle.com/technology/software/tech/oci/instantclient/index.html
-
-Source0:	instantclient-basic-linux-%{version}.zip
-Source1:	instantclient-jdbc-linux-%{version}.zip
-Source2:	instantclient-odbc-linux-%{version}.zip
-Source3:	instantclient-sdk-linux-%{version}.zip
-Source4:	instantclient-sqlplus-linux-%{version}.zip
-Source5:	instantclient-tools-linux-%{version}.zip
-Source6:	instantclient-precomp-linux-%{version}.zip
-NoSource:       0
-NoSource:       1
-NoSource:       2
-NoSource:       3
-NoSource:       4
-NoSource:       5
-NoSource:       6
-
-Buildroot: 	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-#BuildArch:      i386
-
-%global topdir	instantclient_12_1
-%global oradir	%{_libdir}/oracle/%{mainver}/client
-%global incdir	%{_includedir}/oracle/%{mainver}/client
-
-%description
-Base files for Instant Client.  Support for OCI, OCCI,
-and JDBC-OCI applications.
-
-%package -n oracle-instantclient-basic
-Summary:	Instant Client for Oracle Database 11g
-Group:		Applications/File
-
-%description -n oracle-instantclient-basic
-Base files for Instant Client.  Support for OCI, OCCI,
-and JDBC-OCI applications.
-
-%package -n oracle-instantclient-devel
-Summary:	Development headers for Instant Client
-Group:		Applications/File
-Requires: 	oracle-instantclient-basic%{?_isa} = %version
-
-%description -n oracle-instantclient-devel
-Additional header files and an example Makefile for developing Oracle
-applications with Instant Client.
-
-%package -n oracle-instantclient-jdbc
-Summary: 	Supplemental JDBC features under Instant Client
-Group:		Applications/File
-Requires: 	oracle-instantclient-basic%{?_isa} = %version
-
-%description -n oracle-instantclient-jdbc
-Additional support for XA, Internationalization,
-and RowSet operations under JDBC.
-
-%package -n oracle-instantclient-odbc
-Summary: 	Oracle  ODBC Instant Client for Linux
-Group:		Applications/File
-Requires: 	oracle-instantclient-basic%{?_isa} = %version
-
-%description -n oracle-instantclient-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
-Summary:	SQL*Plus for Instant Client
-Group:		Applications/File
-Requires: 	oracle-instantclient-basic%{?_isa} = %version
-
-%description -n oracle-instantclient-sqlplus
-Additional libraries and executable for running
-SQL*Plus with Instant Client.
-
-%package -n oracle-instantclient-tools
-Summary:	Tools for Oracle Database 11g
-Group:		Applications/File
-Requires: 	oracle-instantclient-basic%{?_isa} = %version
-
-%description -n oracle-instantclient-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
-Summary:	Oracle Precompilers for Pro*C and Pro*COBOL
-Group:		Applications/File
-Requires: 	oracle-instantclient-devel%{?_isa} = %version
-
-%description -n oracle-instantclient-precomp
-PRECOMP Instant Client (IC) Package contains following
-components:
-  i) "proc" binary to precompile a Pro*C application
- ii) "procob" binary to precompile a Pro*COBOL application
-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}
-
-unzip %{SOURCE0} | tee BASIC
-unzip %{SOURCE1} | tee JDBC
-unzip %{SOURCE2} | tee ODBC
-unzip %{SOURCE3} | tee DEVEL
-unzip %{SOURCE4} | tee SQLPLUS
-unzip %{SOURCE5} | tee TOOLS
-unzip %{SOURCE6} | tee PRECOMP
-
-
-%install
-rm -rf %{buildroot}
-cd %{topdir}
-
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{oradir}/{bin,lib}
-mkdir -p %{buildroot}%{oradir}/lib/precomp/admin
-mkdir -p %{buildroot}%{incdir}
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-
-# Basic
-install -p adrci		%{buildroot}%{oradir}/bin
-install -p genezi		%{buildroot}%{oradir}/bin
-install -p uidrvci		%{buildroot}%{oradir}/bin
-install -p libclntshcore.so.%{mainver}	%{buildroot}%{oradir}/lib
-install -p libclntsh.so.%{mainver}	%{buildroot}%{oradir}/lib
-install -p libnnz%{major}.so		%{buildroot}%{oradir}/lib
-install -p libocci.so.%{mainver}	%{buildroot}%{oradir}/lib
-install -p libociei.so				%{buildroot}%{oradir}/lib
-install -p libocijdbc%{major}.so	%{buildroot}%{oradir}/lib
-install -p libons.so				%{buildroot}%{oradir}/lib
-install -p liboramysql%{major}.so	%{buildroot}%{oradir}/lib
-install -p ojdbc6.jar		%{buildroot}%{oradir}/lib
-install -p ojdbc7.jar		%{buildroot}%{oradir}/lib
-install -p xstreams.jar		%{buildroot}%{oradir}/lib
-
-echo %{oradir}/lib >%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
-
-# Devel
-install -p -m 644 sdk/include/*.h 	%{buildroot}%{incdir}
-install -p sdk/ottclasses.zip		%{buildroot}%{oradir}/lib
-install -p -m 755 sdk/ott		%{buildroot}%{oradir}/bin
-
-ln -s %{oradir}/bin/ott           %{buildroot}%{_bindir}/ott
-ln -s libocci.so.%{mainver}       %{buildroot}%{oradir}/lib/libocci.so
-ln -s libclntsh.so.%{mainver}     %{buildroot}%{oradir}/lib/libclntsh.so
-ln -s libclntshcore.so.%{mainver} %{buildroot}%{oradir}/lib/libclntshcore.so
-
-# sdk/admin/oraaccess.xsd not provided in upstream RPM.
-
-# SQL*Plus
-install -p sqlplus 		%{buildroot}%{oradir}/bin
-install -p glogin.sql 		%{buildroot}%{oradir}/lib
-install -p libsqlplus.so 	%{buildroot}%{oradir}/lib
-install -p libsqlplusic.so 	%{buildroot}%{oradir}/lib
-
-ln -sf %{oradir}/bin/sqlplus %{buildroot}%{_bindir}/sqlplus
-
-# JDBC
-install -p libheteroxa%{major}.so	%{buildroot}%{oradir}/lib
-install -p orai18n-mapping.jar	%{buildroot}%{oradir}/lib
-install -p orai18n.jar		%{buildroot}%{oradir}/lib
-
-# ODBC
-install -p libsqora.so.%{mainver}	%{buildroot}%{oradir}/lib
-
-# Tools
-install -p wrc 		%{buildroot}%{oradir}/bin
-ln -sf %{oradir}/bin/wrc %{buildroot}%{_bindir}/wrc
-
-# Precomp
-# NOTICE: don't install rtsora - broken dep on  libcobcrtn64.so
-install -p -m 755 sdk/{proc,procob}	%{buildroot}%{oradir}/bin
-install -p -m 755 cobsqlintf.o		%{buildroot}%{oradir}/lib
-install -p -m 644 precomp/admin/*	%{buildroot}%{oradir}/lib/precomp/admin
-
-ln -s %{oradir}/bin/proc %{buildroot}%{_bindir}/proc
-ln -s %{oradir}/bin/procob %{buildroot}%{_bindir}/procob
-
-# Precomp-Devel
-install -p -m 644 sdk/include/*.h     %{buildroot}%{incdir}
-
-# Create files lists
-echo '%%defattr(-,root,root,-)' | tee devel.files > %{topdir}precomp.files
-for header in sdk/include/*.h
-do if grep -q $header ../DEVEL
-   then echo %{incdir}/$(basename $header) >>devel.files
-   else echo %{incdir}/$(basename $header) >>precomp.files
-fi
-done
-
-
-%clean
-rm -rf %{buildroot}
-
-%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
-
-%files -n oracle-instantclient-basic
-%defattr(-,root,root,-)
-%doc %{topdir}/BASIC_README
-%dir %{oradir}
-%dir %{oradir}/lib
-%dir %{oradir}/bin
-%{oradir}/lib/libclntshcore.so.%{mainver}
-%{oradir}/lib/libclntsh.so.%{mainver}
-%{oradir}/lib/libnnz%{major}.so
-%{oradir}/lib/libocci.so.%{mainver}
-%{oradir}/lib/libociei.so
-%{oradir}/lib/libocijdbc%{major}.so
-%{oradir}/lib/libons.so
-%{oradir}/lib/liboramysql%{major}.so
-%{oradir}/lib/ojdbc6.jar
-%{oradir}/lib/ojdbc7.jar
-%{oradir}/lib/xstreams.jar
-%{_sysconfdir}/ld.so.conf.d/%{name}.conf
-%{oradir}/bin/genezi
-%{oradir}/bin/adrci
-%{oradir}/bin/uidrvci
-
-%files -n oracle-instantclient-devel -f %{topdir}/devel.files
-%defattr(-,root,root,-)
-%doc %{topdir}/sdk/demo %{topdir}/sdk/SDK_README %{topdir}/sdk/ott
-%{oradir}/lib/libclntshcore.so
-%{oradir}/lib/libclntsh.so
-%{oradir}/lib/libocci.so
-%{oradir}/lib/ottclasses.zip
-%dir %{incdir}
-%{_bindir}/ott
-%{oradir}/bin/ott
-
-%files -n oracle-instantclient-sqlplus
-%defattr(-,root,root,-)
-%doc %{topdir}/SQLPLUS_README
-%{_bindir}/sqlplus
-%{oradir}/bin/sqlplus
-%{oradir}/lib/glogin.sql
-%{oradir}/lib/libsqlplus.so
-%{oradir}/lib/libsqlplusic.so
-
-%files -n oracle-instantclient-jdbc
-%defattr(-,root,root,-)
-%doc %{topdir}/JDBC_README
-%{oradir}/lib/libheteroxa%{major}.so
-%{oradir}/lib/orai18n-mapping.jar
-%{oradir}/lib/orai18n.jar
-
-%files -n oracle-instantclient-odbc
-%defattr(-,root,root,-)
-%doc %{topdir}/ODBC_IC_Readme_Unix.html
-%doc %{topdir}/odbc_update_ini.sh
-%doc %{topdir}/help
-%{oradir}/lib/libsqora.so.%{mainver}
-
-%files -n oracle-instantclient-tools
-%defattr(-,root,root,-)
-%doc %{topdir}/TOOLS_README
-%{_bindir}/wrc
-%{oradir}/bin/wrc
-
-%files -n oracle-instantclient-precomp -f %{topdir}/precomp.files
-%defattr(-,root,root,-)
-%doc %{topdir}/sdk/demo %{topdir}/PRECOMP_README
-%dir %{oradir}/lib/precomp
-%dir %{oradir}/lib/precomp/admin
-%config  %{oradir}/lib/precomp/admin/pcbcfg.cfg
-%config  %{oradir}/lib/precomp/admin/pcscfg.cfg
-%{oradir}/lib/cobsqlintf.o
-%{oradir}/bin/proc
-%{oradir}/bin/procob
-%{_bindir}/proc
-%{_bindir}/procob
-
-
-%changelog
-* Tue Aug  9 2016 Remi Collet <remi@remirepo.net> 12.1.0.2.0-3
-- simplify headers packaging
-- simplify ldconfig call in scriptlets
-
-* Tue Aug  9 2016 Pierre Duperray <pierreduperray@free.fr> - 12.1.0.2.0-2
-- separated devel and precomp headers and moved precomp pcbcfg.cfg file to the right folder
-
-* Mon Aug  8 2016 Pierre Duperray <pierreduperray@free.fr> - 12.1.0.2.0-1
-- unfortunately due to not yet packaged tuxedo dependancy, remove rtsora from precomp package
-
-* Mon Mar 21 2016 Remi Collet <remi@remirepo.net> 12.1.0.2.0-1
-- update to 12.1.0.2.0
-
-* Fri Jul 26 2013 Remi Collet <RPMS@famillecollet.com> 12.1.0.1.0-1
-- update to 12.1.0.1.0
-
-* Wed Feb 29 2012 Remi Collet <RPMS@famillecollet.com> 11.2.0.3.0-1
-- update to 11.2.0.3.0
-- add precomp subpackage
-- merge some changes from  Ciro Iriarte <ciro.iriarte@gmail.com>
-  http://track.itsolutions.com.py/pub/oracle/oracle-instantclient.spec
-
-* Thu Nov 11 2010 Remi Collet <RPMS@famillecollet.com> 11.2.0.2.0-1
-- update to 11.2.0.2.0
-
-* Sat Dec 26 2009 Remi Collet <RPMS@famillecollet.com> 11.2.0.1-1.###.remi
-- update to 11.2.0.1
-
-* Sun Nov 30 2008 Remi Collet <RPMS@famillecollet.com> 11.1.0.7-1.###.remi
-- update to 11.1.0.7
-- add tools sub-package
-
-* Sat Sep 13 2008 Remi Collet <RPMS@famillecollet.com> 11.1.0.6-1.###.remi
-- improved split spec
-
-* Tue Oct 30 2007 Remi Collet <RPMS@famillecollet.com> 11.1.0.6-1.###.remi
-- split spec for i386, x86_64 and ppc
-- update to 11.1.0.6.0
-
-* Sun Aug 19 2007 Ciro Iriarte <ciriarte@personal.net.py> 10.2.0.3-3.###.remi
-- added genezi to basic package
-
-* Tue May 22 2007 Remi Collet <RPMS@famillecollet.com> 10.2.0.3-3.fc6.remi
-- merge 32/64 spec file for mock
-
-* Tue Nov 14 2006 Remi Collet <RPMS@famillecollet.com> 10.2.0.3-1.fc6.remi
-- update to 10.2.0.3
-
-* Tue Nov 14 2006 Remi Collet <RPMS@famillecollet.com> 10.2.0.2-3.fc6.remi
-- FC6.x86_64 build (conditional targetname & datever)
-
-* Thu Oct 26 2006 Remi Collet <RPMS@famillecollet.com> 10.2.0.2-2.fc6.remi
-- FC6.i386 build
-
-* Fri Jun 23 2006 Remi Collet <RPMS@famillecollet.com> 10.2.0.2-2.fc5.remi
-- Switch back to defaut oracle strategie.
-- add /etc/ld.so.conf.d/oracle-instantclient.conf
-
-* Fri Jun 23 2006 Remi Collet <RPMS@famillecollet.com> 10.2.0.2-1.fc5.remi
-- initial RPM
diff --git a/oracle-instantclient-12.1-x86_64.spec b/oracle-instantclient-12.1-x86_64.spec
deleted file mode 100644
index b67535f..0000000
--- a/oracle-instantclient-12.1-x86_64.spec
+++ /dev/null
@@ -1,367 +0,0 @@
-# SPEC file for x86_64 version of
-# oracle-instantclient-basic
-# oracle-instantclient-devel
-# oracle-instantclient-sqlplus
-# oracle-instantclient-jdbc
-# oracle-instantclient-odbc
-# oracle-instantclient-tools
-# oracle-instantclient-precomp
-
-%define __arch_install_post /bin/true
-
-%global major   12
-%global mainver 12.1
-
-Summary: 	Instant Client for Oracle Database 11g
-Name: 		oracle-instantclient-x86_64
-Version: 	12.1.0.2.0
-Release:	3%{?dist}
-License:	Oracle
-Group:		Applications/File
-Url:		http://www.oracle.com/technology/software/tech/oci/instantclient/index.html
-
-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
-NoSource:       3
-NoSource:       4
-NoSource:       5
-NoSource:       6
-
-Buildroot: 	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch:      x86_64
-
-%global topdir	instantclient_12_1
-%global oradir	%{_libdir}/oracle/%{mainver}/client64
-%global incdir	%{_includedir}/oracle/%{mainver}/client64
-
-%description
-Base files for Instant Client.  Support for OCI, OCCI,
-and JDBC-OCI applications.
-
-%package -n oracle-instantclient-basic
-Summary:	Instant Client for Oracle Database 11g
-Group:		Applications/File
-
-%description -n oracle-instantclient-basic
-Base files for Instant Client.  Support for OCI, OCCI,
-and JDBC-OCI applications.
-
-%package -n oracle-instantclient-devel
-Summary:	Development headers for Instant Client
-Group:		Applications/File
-Requires: 	oracle-instantclient-basic%{?_isa} = %version
-
-%description -n oracle-instantclient-devel
-Additional header files and an example Makefile for developing Oracle
-applications with Instant Client.
-
-%package -n oracle-instantclient-jdbc
-Summary: 	Supplemental JDBC features under Instant Client
-Group:		Applications/File
-Requires: 	oracle-instantclient-basic%{?_isa} = %version
-
-%description -n oracle-instantclient-jdbc
-Additional support for XA, Internationalization,
-and RowSet operations under JDBC.
-
-%package -n oracle-instantclient-odbc
-Summary: 	Oracle  ODBC Instant Client for Linux
-Group:		Applications/File
-Requires: 	oracle-instantclient-basic%{?_isa} = %version
-
-%description -n oracle-instantclient-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
-Summary:	SQL*Plus for Instant Client
-Group:		Applications/File
-Requires: 	oracle-instantclient-basic%{?_isa} = %version
-
-%description -n oracle-instantclient-sqlplus
-Additional libraries and executable for running
-SQL*Plus with Instant Client.
-
-%package -n oracle-instantclient-tools
-Summary:	Tools for Oracle Database 11g
-Group:		Applications/File
-Requires: 	oracle-instantclient-basic%{?_isa} = %version
-
-%description -n oracle-instantclient-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
-Summary:	Oracle Precompilers for Pro*C and Pro*COBOL
-Group:		Applications/File
-Requires: 	oracle-instantclient-devel%{?_isa} = %version
-
-%description -n oracle-instantclient-precomp
-PRECOMP Instant Client (IC) Package contains following
-components:
-  i) "proc" binary to precompile a Pro*C application
- ii) "procob" binary to precompile a Pro*COBOL application
-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}
-
-unzip %{SOURCE0} | tee BASIC
-unzip %{SOURCE1} | tee JDBC
-unzip %{SOURCE2} | tee ODBC
-unzip %{SOURCE3} | tee DEVEL
-unzip %{SOURCE4} | tee SQLPLUS
-unzip %{SOURCE5} | tee TOOLS
-unzip %{SOURCE6} | tee PRECOMP
-
-
-%install
-rm -rf %{buildroot}
-cd %{topdir}
-
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{oradir}/{bin,lib}
-mkdir -p %{buildroot}%{oradir}/lib/precomp/admin
-mkdir -p %{buildroot}%{incdir}
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-
-# Basic
-install -p adrci		%{buildroot}%{oradir}/bin
-install -p genezi		%{buildroot}%{oradir}/bin
-install -p uidrvci		%{buildroot}%{oradir}/bin
-install -p libclntshcore.so.%{mainver}	%{buildroot}%{oradir}/lib
-install -p libclntsh.so.%{mainver}	%{buildroot}%{oradir}/lib
-install -p libnnz%{major}.so		%{buildroot}%{oradir}/lib
-install -p libocci.so.%{mainver}	%{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 libons.so				%{buildroot}%{oradir}/lib
-install -p liboramysql%{major}.so	%{buildroot}%{oradir}/lib
-install -p ojdbc6.jar		%{buildroot}%{oradir}/lib
-install -p ojdbc7.jar		%{buildroot}%{oradir}/lib
-install -p xstreams.jar		%{buildroot}%{oradir}/lib
-
-echo %{oradir}/lib >%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
-
-# Devel
-install -p -m 644 sdk/include/*.h 	%{buildroot}%{incdir}
-install -p sdk/ottclasses.zip		%{buildroot}%{oradir}/lib
-install -p -m 755 sdk/ott		%{buildroot}%{oradir}/bin
-
-ln -s %{oradir}/bin/ott           %{buildroot}%{_bindir}/ott
-ln -s libocci.so.%{mainver}       %{buildroot}%{oradir}/lib/libocci.so
-ln -s libclntsh.so.%{mainver}     %{buildroot}%{oradir}/lib/libclntsh.so
-ln -s libclntshcore.so.%{mainver} %{buildroot}%{oradir}/lib/libclntshcore.so
-
-# sdk/admin/oraaccess.xsd not provided in upstream RPM.
-
-# SQL*Plus
-install -p sqlplus 		%{buildroot}%{oradir}/bin
-install -p glogin.sql 		%{buildroot}%{oradir}/lib
-install -p libsqlplus.so 	%{buildroot}%{oradir}/lib
-install -p libsqlplusic.so 	%{buildroot}%{oradir}/lib
-
-ln -sf %{oradir}/bin/sqlplus %{buildroot}%{_bindir}/sqlplus
-
-# JDBC
-install -p libheteroxa%{major}.so	%{buildroot}%{oradir}/lib
-install -p orai18n-mapping.jar	%{buildroot}%{oradir}/lib
-install -p orai18n.jar		%{buildroot}%{oradir}/lib
-
-# ODBC
-install -p libsqora.so.%{mainver}	%{buildroot}%{oradir}/lib
-
-# Tools
-install -p wrc 		%{buildroot}%{oradir}/bin
-ln -sf %{oradir}/bin/wrc %{buildroot}%{_bindir}/wrc
-
-# Precomp
-# NOTICE: don't install rtsora - broken dep on  libcobcrtn64.so
-install -p -m 755 sdk/{proc,procob}	%{buildroot}%{oradir}/bin
-install -p -m 755 cobsqlintf.o		%{buildroot}%{oradir}/lib
-install -p -m 644 precomp/admin/*	%{buildroot}%{oradir}/lib/precomp/admin
-
-ln -s %{oradir}/bin/proc %{buildroot}%{_bindir}/proc
-ln -s %{oradir}/bin/procob %{buildroot}%{_bindir}/procob
-
-# Precomp-Devel
-install -p -m 644 sdk/include/*.h     %{buildroot}%{incdir}
-
-
-# Create files lists
-echo '%%defattr(-,root,root,-)' | tee devel.files > %{topdir}precomp.files
-for header in sdk/include/*.h
-do if grep -q $header ../DEVEL
-   then echo %{incdir}/$(basename $header) >>devel.files
-   else echo %{incdir}/$(basename $header) >>precomp.files
-fi
-done
-
-
-%clean
-rm -rf %{buildroot}
-
-%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
-
-
-%files -n oracle-instantclient-basic
-%defattr(-,root,root,-)
-%doc %{topdir}/BASIC_README
-%dir %{oradir}
-%dir %{oradir}/lib
-%dir %{oradir}/bin
-%{oradir}/lib/libclntshcore.so.%{mainver}
-%{oradir}/lib/libclntsh.so.%{mainver}
-%{oradir}/lib/libnnz%{major}.so
-%{oradir}/lib/libocci.so.%{mainver}
-%{oradir}/lib/libipc1.so
-%{oradir}/lib/libmql1.so
-%{oradir}/lib/libociei.so
-%{oradir}/lib/libocijdbc%{major}.so
-%{oradir}/lib/libons.so
-%{oradir}/lib/liboramysql%{major}.so
-%{oradir}/lib/ojdbc6.jar
-%{oradir}/lib/ojdbc7.jar
-%{oradir}/lib/xstreams.jar
-%{_sysconfdir}/ld.so.conf.d/%{name}.conf
-%{oradir}/bin/genezi
-%{oradir}/bin/adrci
-%{oradir}/bin/uidrvci
-
-%files -n oracle-instantclient-devel -f %{topdir}/devel.files
-%defattr(-,root,root,-)
-%doc %{topdir}/sdk/demo %{topdir}/sdk/SDK_README %{topdir}/sdk/ott
-%{oradir}/lib/libclntshcore.so
-%{oradir}/lib/libclntsh.so
-%{oradir}/lib/libocci.so
-%{oradir}/lib/ottclasses.zip
-%dir %{incdir}
-%{_bindir}/ott
-%{oradir}/bin/ott
-
-%files -n oracle-instantclient-sqlplus
-%defattr(-,root,root,-)
-%doc %{topdir}/SQLPLUS_README
-%{_bindir}/sqlplus
-%{oradir}/bin/sqlplus
-%{oradir}/lib/glogin.sql
-%{oradir}/lib/libsqlplus.so
-%{oradir}/lib/libsqlplusic.so
-
-%files -n oracle-instantclient-jdbc
-%defattr(-,root,root,-)
-%doc %{topdir}/JDBC_README
-%{oradir}/lib/libheteroxa%{major}.so
-%{oradir}/lib/orai18n-mapping.jar
-%{oradir}/lib/orai18n.jar
-
-%files -n oracle-instantclient-odbc
-%defattr(-,root,root,-)
-%doc %{topdir}/ODBC_IC_Readme_Unix.html
-%doc %{topdir}/odbc_update_ini.sh
-%doc %{topdir}/help
-%{oradir}/lib/libsqora.so.%{mainver}
-
-%files -n oracle-instantclient-tools
-%defattr(-,root,root,-)
-%doc %{topdir}/TOOLS_README
-%{_bindir}/wrc
-%{oradir}/bin/wrc
-
-%files -n oracle-instantclient-precomp -f %{topdir}/precomp.files
-%defattr(-,root,root,-)
-%doc %{topdir}/sdk/demo %{topdir}/PRECOMP_README
-%dir %{oradir}/lib/precomp
-%dir %{oradir}/lib/precomp/admin
-%config  %{oradir}/lib/precomp/admin/pcbcfg.cfg
-%config  %{oradir}/lib/precomp/admin/pcscfg.cfg
-%{oradir}/lib/cobsqlintf.o
-%{oradir}/bin/proc
-%{oradir}/bin/procob
-%{_bindir}/proc
-%{_bindir}/procob
-
-
-%changelog
-* Tue Aug  9 2016 Remi Collet <remi@remirepo.net> 12.1.0.2.0-3
-- simplify headers packaging
-- simplify ldconfig call in scriptlets
-
-* Tue Aug  9 2016 Pierre Duperray <pierreduperray@free.fr> - 12.1.0.2.0-2
-- separated devel and precomp headers and moved precomp pcbcfg.cfg file to the right folder
-
-* Mon Aug  8 2016 Pierre Duperray <pierreduperray@free.fr> - 12.1.0.2.0-1
-- unfortunately due to not yet packaged tuxedo dependancy, remove rtsora from precomp package
-
-* Fri Jul 26 2013 Remi Collet <RPMS@famillecollet.com> 12.1.0.1.0-1
-- update to 12.1.0.1.0
-
-* Wed Feb 29 2012 Remi Collet <RPMS@famillecollet.com> 11.2.0.3.0-1
-- update to 11.2.0.3.0
-- add precomp subpackage
-- merge some changes from  Ciro Iriarte <ciro.iriarte@gmail.com>
-  http://track.itsolutions.com.py/pub/oracle/oracle-instantclient.spec
-
-* Thu Nov 11 2010 Remi Collet <RPMS@famillecollet.com> 11.2.0.2.0-1
-- update to 11.2.0.2.0
-
-* Fri Feb 12 2010 Remi Collet <RPMS@famillecollet.com> 11.2.0.1.0-1.###.remi
-- update to 11.2.0.1.0
-
-* Sat Dec 26 2009 Remi Collet <RPMS@famillecollet.com> 11.2.0.0.2-1.###.remi
-- update to 11.2.0.0.2
-
-* Thu Dec 04 2008 Remi Collet <RPMS@famillecollet.com> 11.1.0.7-1.###.remi
-- update to 11.1.0.7
-- add tools sub-package
-
-* Sat Sep 13 2008 Remi Collet <RPMS@famillecollet.com> 11.1.0.6-1.###.remi
-- improved split spec
-
-* Tue Dec 11 2007 Remi Collet <RPMS@famillecollet.com> 11.1.0.6-1.###.remi
-- version 11.1.0.6
-
-* Fri Nov 09 2007 Remi Collet <RPMS@famillecollet.com> 10.2.0.3-3.fc8.remi
-- split spec for i386, x86_64 and ppc
-- F8 rebuid
-
-* Sun Aug 19 2007 Ciro Iriarte <ciriarte@personal.net.py> 10.2.0.3-3.###.remi
-- added genezi to basic package
-
-* Tue May 22 2007 Remi Collet <RPMS@famillecollet.com> 10.2.0.3-3.fc6.remi
-- merge 32/64 spec file for mock
-
-* Tue Nov 14 2006 Remi Collet <RPMS@famillecollet.com> 10.2.0.3-1.fc6.remi
-- update to 10.2.0.3
-
-* Tue Nov 14 2006 Remi Collet <RPMS@famillecollet.com> 10.2.0.2-3.fc6.remi
-- FC6.x86_64 build (conditional targetname & datever)
-
-* Thu Oct 26 2006 Remi Collet <RPMS@famillecollet.com> 10.2.0.2-2.fc6.remi
-- FC6.i386 build
-
-* Fri Jun 23 2006 Remi Collet <RPMS@famillecollet.com> 10.2.0.2-2.fc5.remi
-- Switch back to defaut oracle strategie.
-- add /etc/ld.so.conf.d/oracle-instantclient.conf
-
-* Fri Jun 23 2006 Remi Collet <RPMS@famillecollet.com> 10.2.0.2-1.fc5.remi
-- initial RPM
diff --git a/oracle-instantclient-18.3-i386.spec b/oracle-instantclient-18-i386.spec
index 92f5474..364fd33 100644
--- a/oracle-instantclient-18.3-i386.spec
+++ b/oracle-instantclient-18-i386.spec
@@ -1,13 +1,14 @@
-# SPEC file for i386 version of
-# oracle-instantclient-basic
-# oracle-instantclient-devel
-# oracle-instantclient-sqlplus
-# oracle-instantclient-jdbc
-# oracle-instantclient-odbc
-# oracle-instantclient-tools
-# oracle-instantclient-precomp
-
-%define __arch_install_post /bin/true
+# remirepo/fedora spec file for oracle-instantclient/i386
+#
+# Copyright (c) 2006-2019 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
+
+%global __arch_install_post /bin/true
+%global _build_id_links none
 
 %global major   18
 %global mainver 18.3
@@ -40,7 +41,6 @@ Source6:	instantclient-precomp-linux-%{version}dbru.zip
 #NoSource:       5
 #NoSource:       6
 
-Buildroot: 	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 #BuildArch:      i386
 
 %description
@@ -131,7 +131,6 @@ unzip %{SOURCE6} | tee PRECOMP
 
 
 %install
-rm -rf %{buildroot}
 cd %{topdir}
 
 mkdir -p %{buildroot}%{_bindir}
@@ -205,7 +204,7 @@ ln -s %{oradir}/bin/procob %{buildroot}%{_bindir}/procob
 install -p -m 644 sdk/include/*.h     %{buildroot}%{incdir}
 
 # Create files lists
-echo '%%defattr(-,root,root,-)' | tee devel.files > %{topdir}precomp.files
+rm -f devel.files precomp.files
 for header in sdk/include/*.h
 do if grep -q $header ../DEVEL
    then echo %{incdir}/$(basename $header) >>devel.files
@@ -214,16 +213,15 @@ fi
 done
 
 
-%clean
-rm -rf %{buildroot}
-
 %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
 
+
+%{!?_licensedir:%global license %%doc}
+
 %files -n oracle-instantclient-basic
-%defattr(-,root,root,-)
 %doc %{topdir}/BASIC_README
 %dir %{oradir}
 %dir %{oradir}/lib
@@ -244,7 +242,6 @@ rm -rf %{buildroot}
 %{oradir}/bin/uidrvci
 
 %files -n oracle-instantclient-devel -f %{topdir}/devel.files
-%defattr(-,root,root,-)
 %doc %{topdir}/sdk/demo %{topdir}/sdk/SDK_README %{topdir}/sdk/ott
 %{oradir}/lib/libclntshcore.so
 %{oradir}/lib/libclntsh.so
@@ -255,7 +252,6 @@ rm -rf %{buildroot}
 %{oradir}/bin/ott
 
 %files -n oracle-instantclient-sqlplus
-%defattr(-,root,root,-)
 %doc %{topdir}/SQLPLUS_README
 %{_bindir}/sqlplus
 %{oradir}/bin/sqlplus
@@ -264,21 +260,18 @@ rm -rf %{buildroot}
 %{oradir}/lib/libsqlplusic.so
 
 %files -n oracle-instantclient-jdbc
-%defattr(-,root,root,-)
 %doc %{topdir}/JDBC_README
 %{oradir}/lib/libheteroxa%{major}.so
 %{oradir}/lib/orai18n-mapping.jar
 %{oradir}/lib/orai18n.jar
 
 %files -n oracle-instantclient-odbc
-%defattr(-,root,root,-)
 %doc %{topdir}/ODBC_README
 %doc %{topdir}/odbc_update_ini.sh
 %doc %{topdir}/help
 %{oradir}/lib/libsqora.so.%{libclnt}
 
 %files -n oracle-instantclient-tools
-%defattr(-,root,root,-)
 %doc %{topdir}/TOOLS_README
 %{_bindir}/exp
 %{_bindir}/expdp
@@ -295,7 +288,6 @@ rm -rf %{buildroot}
 %{oradir}/lib/libnfsodm%{major}.so
 
 %files -n oracle-instantclient-precomp -f %{topdir}/precomp.files
-%defattr(-,root,root,-)
 %doc %{topdir}/sdk/demo %{topdir}/PRECOMP_README
 %dir %{oradir}/lib/precomp
 %dir %{oradir}/lib/precomp/admin
diff --git a/oracle-instantclient-18.3-x86_64.spec b/oracle-instantclient-18-x86_64.spec
index 8a1b35f..514d826 100644
--- a/oracle-instantclient-18.3-x86_64.spec
+++ b/oracle-instantclient-18-x86_64.spec
@@ -1,24 +1,25 @@
-# SPEC file for x86_64 version of
-# oracle-instantclient-basic
-# oracle-instantclient-devel
-# oracle-instantclient-sqlplus
-# oracle-instantclient-jdbc
-# oracle-instantclient-odbc
-# oracle-instantclient-tools
-# oracle-instantclient-precomp
-
-%define __arch_install_post /bin/true
+# remirepo/fedora spec file for oracle-instantclient/x86_64
+#
+# Copyright (c) 2006-2019 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
+
+%global __arch_install_post /bin/true
+%global _build_id_links none
 
 %global major   18
-%global mainver 18.3
+%global mainver 18.5
 %global libclnt 18.1
-%global topdir	instantclient_18_3
+%global topdir	instantclient_18_5
 %global oradir	%{_libdir}/oracle/%{mainver}/client64
 %global incdir	%{_includedir}/oracle/%{mainver}/client64
 
 Summary: 	Instant Client for Oracle Database 11g
 Name: 		oracle-instantclient-x86_64
-Version: 	18.3.0.0.0
+Version: 	18.5.0.0.0
 Release:	1%{?dist}
 License:	Oracle
 Group:		Applications/File
@@ -39,7 +40,6 @@ Source6:	instantclient-precomp-linux.x64-%{version}dbru.zip
 #NoSource:       5
 #NoSource:       6
 
-Buildroot: 	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      x86_64
 
 
@@ -131,7 +131,6 @@ unzip %{SOURCE6} | tee PRECOMP
 
 
 %install
-rm -rf %{buildroot}
 cd %{topdir}
 
 mkdir -p %{buildroot}%{_bindir}
@@ -208,7 +207,7 @@ install -p -m 644 sdk/include/*.h     %{buildroot}%{incdir}
 
 
 # Create files lists
-echo '%%defattr(-,root,root,-)' | tee devel.files > %{topdir}precomp.files
+rm -f devel.files precomp.files
 for header in sdk/include/*.h
 do if grep -q $header ../DEVEL
    then echo %{incdir}/$(basename $header) >>devel.files
@@ -217,17 +216,16 @@ fi
 done
 
 
-%clean
-rm -rf %{buildroot}
-
 %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
 
 
+%{!?_licensedir:%global license %%doc}
+
 %files -n oracle-instantclient-basic
-%defattr(-,root,root,-)
+%license %{topdir}/BASIC_LICENSE
 %doc %{topdir}/BASIC_README
 %dir %{oradir}
 %dir %{oradir}/lib
@@ -250,8 +248,8 @@ rm -rf %{buildroot}
 %{oradir}/bin/uidrvci
 
 %files -n oracle-instantclient-devel -f %{topdir}/devel.files
-%defattr(-,root,root,-)
-%doc %{topdir}/sdk/demo %{topdir}/sdk/SDK_README %{topdir}/sdk/ott
+%license %{topdir}/SDK_LICENSE
+%doc %{topdir}/sdk/demo %{topdir}/SDK_README %{topdir}/sdk/ott
 %{oradir}/lib/libclntshcore.so
 %{oradir}/lib/libclntsh.so
 %{oradir}/lib/libocci.so
@@ -261,7 +259,7 @@ rm -rf %{buildroot}
 %{oradir}/bin/ott
 
 %files -n oracle-instantclient-sqlplus
-%defattr(-,root,root,-)
+%license %{topdir}/SQLPLUS_LICENSE
 %doc %{topdir}/SQLPLUS_README
 %{_bindir}/sqlplus
 %{oradir}/bin/sqlplus
@@ -270,21 +268,21 @@ rm -rf %{buildroot}
 %{oradir}/lib/libsqlplusic.so
 
 %files -n oracle-instantclient-jdbc
-%defattr(-,root,root,-)
+%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
-%defattr(-,root,root,-)
+%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
-%defattr(-,root,root,-)
+%license %{topdir}/TOOLS_LICENSE
 %doc %{topdir}/TOOLS_README
 %{_bindir}/exp
 %{_bindir}/expdp
@@ -301,7 +299,6 @@ rm -rf %{buildroot}
 %{oradir}/lib/libnfsodm%{major}.so
 
 %files -n oracle-instantclient-precomp -f %{topdir}/precomp.files
-%defattr(-,root,root,-)
 %doc %{topdir}/sdk/demo %{topdir}/PRECOMP_README
 %dir %{oradir}/lib/precomp
 %dir %{oradir}/lib/precomp/admin
@@ -315,8 +312,11 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Sep  4 2018 Remi Collet <remi@remirepo.net> 13.3.0.0.0-1
-- update to 13.3.0.0.0
+* Wed Apr 17 2019 Remi Collet <remi@remirepo.net> 18.5.0.0.0-1
+- update to 18.5.0.0.0
+
+* Tue Sep  4 2018 Remi Collet <remi@remirepo.net> 18.3.0.0.0-1
+- update to 18.3.0.0.0
 
 * Fri Mar 24 2017 Remi Collet <remi@remirepo.net> 12.2.0.1.0-2
 - fix links in devel sub-package