oracle-instantclient: 12.1.0.1.0

17 files changed, 330 insertions, 56 deletions

diff --git a/Makefile b/Makefile
index 62912c6..fdf7e6f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 SRCDIR := $(shell pwd)
-NAME := oracle-instantclient-11.2
+NAME := oracle-instantclient-12.1
 
 RPMDEFINES := --define "_sourcedir $(SRCDIR)" \
               --define "_specdir $(SRCDIR)" \
diff --git a/list/basic11 b/list/basic11
new file mode 100644
index 0000000..c81a446
--- /dev/null
+++ b/list/basic11
@@ -0,0 +1,12 @@
+/adrci
+/BASIC_README
+/genezi
+/libclntsh.so.11.1
+/libnnz11.so
+/libocci.so.11.1
+/libociei.so
+/libocijdbc11.so
+/ojdbc5.jar
+/ojdbc6.jar
+/uidrvci
+/xstreams.jar
diff --git a/list/basic12 b/list/basic12
new file mode 100644
index 0000000..45cc482
--- /dev/null
+++ b/list/basic12
@@ -0,0 +1,15 @@
+/adrci
+/BASIC_README
+/genezi
+/libclntshcore.so.12.1
+/libclntsh.so.12.1
+/libnnz12.so
+/libocci.so.12.1
+/libociei.so
+/libocijdbc12.so
+/libons.so
+/liboramysql12.so
+/ojdbc6.jar
+/ojdbc7.jar
+/uidrvci
+/xstreams.jar
diff --git a/list/jdbc11 b/list/jdbc11
new file mode 100644
index 0000000..8fe096c
--- /dev/null
+++ b/list/jdbc11
@@ -0,0 +1,4 @@
+/JDBC_README
+/libheteroxa11.so
+/orai18n.jar
+/orai18n-mapping.jar
diff --git a/list/jdbc12 b/list/jdbc12
new file mode 100644
index 0000000..358235d
--- /dev/null
+++ b/list/jdbc12
@@ -0,0 +1,4 @@
+/JDBC_README
+/libheteroxa12.so
+/orai18n.jar
+/orai18n-mapping.jar
diff --git a/list/odbc11 b/list/odbc11
new file mode 100644
index 0000000..33f7cca
--- /dev/null
+++ b/list/odbc11
@@ -0,0 +1,5 @@
+/libsqora.so.11.1
+/ODBC_IC_Readme_Unix.html
+/ODBCRelnotesJA.htm
+/ODBCRelnotesUS.htm
+/odbc_update_ini.sh
diff --git a/list/odbc12 b/list/odbc12
new file mode 100644
index 0000000..f36da59
--- /dev/null
+++ b/list/odbc12
@@ -0,0 +1,53 @@
+/help/
+/help/ja/
+/help/ja/blafdoc.css
+/help/ja/cpyr.htm
+/help/ja/img/
+/help/ja/img/odbcdrvarch.gif
+/help/ja/img/odbcmodel.gif
+/help/ja/img/setup_app.gif
+/help/ja/img/setup_ora.gif
+/help/ja/img/setup_ssmig.gif
+/help/ja/img/setup_work.gif
+/help/ja/img_text/
+/help/ja/img_text/odbcdrvarch.htm
+/help/ja/img_text/odbcmodel.htm
+/help/ja/img_text/setup_app.htm
+/help/ja/img_text/setup_ora.htm
+/help/ja/img_text/setup_ssmig.htm
+/help/ja/img_text/setup_work.htm
+/help/ja/map.xml
+/help/ja/META-INF/
+/help/ja/META-INF/MANIFEST.MF
+/help/ja/oracle.gif
+/help/ja/sqora.htm
+/help/ja/toc.htm
+/help/us/
+/help/us/blafdoc.css
+/help/us/cpyr.htm
+/help/us/help/
+/help/us/img/
+/help/us/img/odbcdrvarch.gif
+/help/us/img/odbcmodel.gif
+/help/us/img/setup_app.gif
+/help/us/img/setup_ora.gif
+/help/us/img/setup_ssmig.gif
+/help/us/img/setup_work.gif
+/help/us/img_text/
+/help/us/img_text/odbcdrvarch.htm
+/help/us/img_text/odbcmodel.htm
+/help/us/img_text/setup_app.htm
+/help/us/img_text/setup_ora.htm
+/help/us/img_text/setup_ssmig.htm
+/help/us/img_text/setup_work.htm
+/help/us/map.xml
+/help/us/META-INF/
+/help/us/META-INF/MANIFEST.MF
+/help/us/oracle.gif
+/help/us/sqora.htm
+/help/us/toc.htm
+/libsqora.so.12.1
+/ODBC_IC_Readme_Unix.html
+/ODBCRelnotesJA.htm
+/ODBCRelnotesUS.htm
+/odbc_update_ini.sh
diff --git a/list/precomp11 b/list/precomp11
new file mode 100644
index 0000000..d8f106c
--- /dev/null
+++ b/list/precomp11
@@ -0,0 +1,24 @@
+/cobsqlintf.o
+/precomp/
+/precomp/admin/
+/precomp/admin/pcbcfg.cfg
+/precomp/admin/pcscfg.cfg
+/PRECOMP_README
+/sdk/
+/sdk/demo/
+/sdk/demo/demo_proc_ic.mk
+/sdk/demo/demo_procob_ic.mk
+/sdk/demo/procdemo.pc
+/sdk/demo/procobdemo.pco
+/sdk/include/
+/sdk/include/oraca.h
+/sdk/include/sql2oci.h
+/sdk/include/sqlapr.h
+/sdk/include/sqlca.h
+/sdk/include/sqlcpr.h
+/sdk/include/sqlda.h
+/sdk/include/sqlkpr.h
+/sdk/include/sqlucs2.h
+/sdk/proc
+/sdk/procob
+/sdk/rtsora
diff --git a/list/precomp12 b/list/precomp12
new file mode 100644
index 0000000..d8f106c
--- /dev/null
+++ b/list/precomp12
@@ -0,0 +1,24 @@
+/cobsqlintf.o
+/precomp/
+/precomp/admin/
+/precomp/admin/pcbcfg.cfg
+/precomp/admin/pcscfg.cfg
+/PRECOMP_README
+/sdk/
+/sdk/demo/
+/sdk/demo/demo_proc_ic.mk
+/sdk/demo/demo_procob_ic.mk
+/sdk/demo/procdemo.pc
+/sdk/demo/procobdemo.pco
+/sdk/include/
+/sdk/include/oraca.h
+/sdk/include/sql2oci.h
+/sdk/include/sqlapr.h
+/sdk/include/sqlca.h
+/sdk/include/sqlcpr.h
+/sdk/include/sqlda.h
+/sdk/include/sqlkpr.h
+/sdk/include/sqlucs2.h
+/sdk/proc
+/sdk/procob
+/sdk/rtsora
diff --git a/list/sdk11 b/list/sdk11
new file mode 100644
index 0000000..a097a48
--- /dev/null
+++ b/list/sdk11
@@ -0,0 +1,42 @@
+/sdk/
+/sdk/demo/
+/sdk/demo/cdemo81.c
+/sdk/demo/demo.mk
+/sdk/demo/occidemod.sql
+/sdk/demo/occidemo.sql
+/sdk/demo/occidml.cpp
+/sdk/demo/occiobj.cpp
+/sdk/demo/occiobj.typ
+/sdk/include/
+/sdk/include/ldap.h
+/sdk/include/nzerror.h
+/sdk/include/nzt.h
+/sdk/include/occiAQ.h
+/sdk/include/occiCommon.h
+/sdk/include/occiControl.h
+/sdk/include/occiData.h
+/sdk/include/occi.h
+/sdk/include/occiObjects.h
+/sdk/include/oci1.h
+/sdk/include/oci8dp.h
+/sdk/include/ociap.h
+/sdk/include/ociapr.h
+/sdk/include/ocidef.h
+/sdk/include/ocidem.h
+/sdk/include/ocidfn.h
+/sdk/include/ociextp.h
+/sdk/include/oci.h
+/sdk/include/ocikpr.h
+/sdk/include/ocixmldb.h
+/sdk/include/ocixstream.h
+/sdk/include/odci.h
+/sdk/include/oratypes.h
+/sdk/include/orid.h
+/sdk/include/ori.h
+/sdk/include/orl.h
+/sdk/include/oro.h
+/sdk/include/ort.h
+/sdk/include/xa.h
+/sdk/ott
+/sdk/ottclasses.zip
+/sdk/SDK_README
diff --git a/list/sdk12 b/list/sdk12
new file mode 100644
index 0000000..348923f
--- /dev/null
+++ b/list/sdk12
@@ -0,0 +1,47 @@
+/
+/sdk/
+/sdk/admin/
+/sdk/admin/oraaccess.xsd
+/sdk/demo/
+/sdk/demo/cdemo81.c
+/sdk/demo/demo.mk
+/sdk/demo/occidemod.sql
+/sdk/demo/occidemo.sql
+/sdk/demo/occidml.cpp
+/sdk/demo/occiobj.cpp
+/sdk/demo/occiobj.typ
+/sdk/demo/oraaccess.xml
+/sdk/demo/setuporamysql.sh
+/sdk/include/
+/sdk/include/ldap.h
+/sdk/include/nzerror.h
+/sdk/include/nzt.h
+/sdk/include/occiAQ.h
+/sdk/include/occiCommon.h
+/sdk/include/occiControl.h
+/sdk/include/occiData.h
+/sdk/include/occi.h
+/sdk/include/occiObjects.h
+/sdk/include/oci1.h
+/sdk/include/oci8dp.h
+/sdk/include/ociap.h
+/sdk/include/ociapr.h
+/sdk/include/ocidef.h
+/sdk/include/ocidem.h
+/sdk/include/ocidfn.h
+/sdk/include/ociextp.h
+/sdk/include/oci.h
+/sdk/include/ocikpr.h
+/sdk/include/ocixmldb.h
+/sdk/include/ocixstream.h
+/sdk/include/odci.h
+/sdk/include/oratypes.h
+/sdk/include/orid.h
+/sdk/include/ori.h
+/sdk/include/orl.h
+/sdk/include/oro.h
+/sdk/include/ort.h
+/sdk/include/xa.h
+/sdk/ott
+/sdk/ottclasses.zip
+/sdk/SDK_README
diff --git a/list/sql11 b/list/sql11
new file mode 100644
index 0000000..c1813f8
--- /dev/null
+++ b/list/sql11
@@ -0,0 +1,5 @@
+/glogin.sql
+/libsqlplusic.so
+/libsqlplus.so
+/sqlplus
+/SQLPLUS_README
diff --git a/list/sql12 b/list/sql12
new file mode 100644
index 0000000..c1813f8
--- /dev/null
+++ b/list/sql12
@@ -0,0 +1,5 @@
+/glogin.sql
+/libsqlplusic.so
+/libsqlplus.so
+/sqlplus
+/SQLPLUS_README
diff --git a/list/tools11 b/list/tools11
new file mode 100644
index 0000000..1efeabd
--- /dev/null
+++ b/list/tools11
@@ -0,0 +1,2 @@
+/TOOLS_README
+/wrc
diff --git a/list/tools12 b/list/tools12
new file mode 100644
index 0000000..1efeabd
--- /dev/null
+++ b/list/tools12
@@ -0,0 +1,2 @@
+/TOOLS_README
+/wrc
diff --git a/oracle-instantclient-12.1-i386.spec b/oracle-instantclient-12.1-i386.spec
index 84753bc..977ea8b 100644
--- a/oracle-instantclient-12.1-i386.spec
+++ b/oracle-instantclient-12.1-i386.spec
@@ -8,11 +8,12 @@
 
 %define __arch_install_post /bin/true
 
-%global mainver 11.2
+%global major   12
+%global mainver 12.1
 
 Summary: 	Instant Client for Oracle Database 11g
 Name: 		oracle-instantclient-i386
-Version: 	11.2.0.3.0
+Version: 	12.1.0.1.0
 Release:	1%{?dist}
 License:	Oracle
 Group:		Applications/File
@@ -36,7 +37,7 @@ NoSource:       6
 Buildroot: 	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 #BuildArch:      i386
 
-%global topdir	instantclient_11_2
+%global topdir	instantclient_12_1
 %global oradir	%{_libdir}/oracle/%{mainver}/client
 %global incdir	%{_includedir}/oracle/%{mainver}/client
 
@@ -55,7 +56,7 @@ and JDBC-OCI applications.
 %package -n oracle-instantclient-devel
 Summary:	Development headers for Instant Client
 Group:		Applications/File
-Requires: 	oracle-instantclient-basic = %version
+Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
 %description -n oracle-instantclient-devel
 Additional header files and an example Makefile for developing Oracle
@@ -64,7 +65,7 @@ applications with Instant Client.
 %package -n oracle-instantclient-jdbc
 Summary: 	Supplemental JDBC features under Instant Client
 Group:		Applications/File
-Requires: 	oracle-instantclient-basic = %version
+Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
 %description -n oracle-instantclient-jdbc
 Additional support for XA, Internationalization,
@@ -73,7 +74,7 @@ and RowSet operations under JDBC.
 %package -n oracle-instantclient-odbc
 Summary: 	Oracle  ODBC Instant Client for Linux
 Group:		Applications/File
-Requires: 	oracle-instantclient-basic = %version
+Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
 %description -n oracle-instantclient-odbc
 Oracle  ODBC Instant Client for Linux complies with 
@@ -84,7 +85,7 @@ 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 = %version
+Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
 %description -n oracle-instantclient-sqlplus
 Additional libraries and executable for running 
@@ -93,7 +94,7 @@ SQL*Plus with Instant Client.
 %package -n oracle-instantclient-tools
 Summary:	Tools for Oracle Database 11g
 Group:		Applications/File
-Requires: 	oracle-instantclient-basic = %version
+Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
 %description -n oracle-instantclient-tools
 This package provides tools to be used with the Oracle Database.
@@ -103,7 +104,7 @@ It currently includes
 %package -n oracle-instantclient-precomp
 Summary:	Oracle Precompilers for Pro*C and Pro*COBOL
 Group:		Applications/File
-Requires: 	oracle-instantclient-devel = %version
+Requires: 	oracle-instantclient-devel%{?_isa} = %version
 
 %description -n oracle-instantclient-precomp
 PRECOMP Instant Client (IC) Package contains following
@@ -114,6 +115,7 @@ 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}
 
@@ -139,13 +141,16 @@ 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
-install -p libclntsh.so.11.1	%{buildroot}%{oradir}/lib
-install -p libnnz11.so		%{buildroot}%{oradir}/lib
-install -p libocci.so.11.1	%{buildroot}%{oradir}/lib
-install -p libociei.so		%{buildroot}%{oradir}/lib
-install -p libocijdbc11.so	%{buildroot}%{oradir}/lib
-install -p ojdbc5.jar		%{buildroot}%{oradir}/lib
+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
@@ -155,9 +160,12 @@ 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.11.1   %{buildroot}%{oradir}/lib/libocci.so
-ln -s libclntsh.so.11.1 %{buildroot}%{oradir}/lib/libclntsh.so
+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
@@ -168,12 +176,12 @@ install -p libsqlplusic.so 	%{buildroot}%{oradir}/lib
 ln -sf %{oradir}/bin/sqlplus %{buildroot}%{_bindir}/sqlplus
 
 # JDBC
-install -p libheteroxa11.so	%{buildroot}%{oradir}/lib
+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.11.1	%{buildroot}%{oradir}/lib
+install -p libsqora.so.%{mainver}	%{buildroot}%{oradir}/lib
 
 # Tools
 install -p wrc 		%{buildroot}%{oradir}/bin
@@ -207,13 +215,16 @@ rm -rf %{buildroot}
 %dir %{oradir}
 %dir %{oradir}/lib
 %dir %{oradir}/bin
-%{oradir}/lib/libclntsh.so.11.1
-%{oradir}/lib/libnnz11.so
-%{oradir}/lib/libocci.so.11.1
+%{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/libocijdbc11.so
-%{oradir}/lib/ojdbc5.jar
+%{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
@@ -223,6 +234,7 @@ rm -rf %{buildroot}
 %files -n oracle-instantclient-devel
 %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
@@ -248,7 +260,7 @@ rm -rf %{buildroot}
 %files -n oracle-instantclient-jdbc
 %defattr(-,root,root)
 %doc %{topdir}/JDBC_README
-%{oradir}/lib/libheteroxa11.so
+%{oradir}/lib/libheteroxa%{major}.so
 %{oradir}/lib/orai18n-mapping.jar
 %{oradir}/lib/orai18n.jar
 
@@ -256,7 +268,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc %{topdir}/ODBC_IC_Readme_Unix.html %{topdir}/ODBCRelnotesJA.htm %{topdir}/ODBCRelnotesUS.htm
 %doc %{topdir}/odbc_update_ini.sh
-%{oradir}/lib/libsqora.so.11.1
+%doc %{topdir}/help
+%{oradir}/lib/libsqora.so.%{mainver}
 
 %files -n oracle-instantclient-tools
 %defattr(-,root,root)
@@ -281,6 +294,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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
diff --git a/oracle-instantclient-12.1-x86_64.spec b/oracle-instantclient-12.1-x86_64.spec
index 8ee1401..28ad061 100644
--- a/oracle-instantclient-12.1-x86_64.spec
+++ b/oracle-instantclient-12.1-x86_64.spec
@@ -8,11 +8,12 @@
 
 %define __arch_install_post /bin/true
 
-%global mainver 11.2
+%global major   12
+%global mainver 12.1
 
 Summary: 	Instant Client for Oracle Database 11g
 Name: 		oracle-instantclient-x86_64
-Version: 	11.2.0.3.0
+Version: 	12.1.0.1.0
 Release:	1%{?dist}
 License:	Oracle
 Group:		Applications/File
@@ -25,7 +26,6 @@ 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
@@ -37,7 +37,7 @@ NoSource:       6
 Buildroot: 	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      x86_64
 
-%global topdir	instantclient_11_2
+%global topdir	instantclient_12_1
 %global oradir	%{_libdir}/oracle/%{mainver}/client64
 %global incdir	%{_includedir}/oracle/%{mainver}/client64
 
@@ -56,7 +56,7 @@ and JDBC-OCI applications.
 %package -n oracle-instantclient-devel
 Summary:	Development headers for Instant Client
 Group:		Applications/File
-Requires: 	oracle-instantclient-basic = %version
+Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
 %description -n oracle-instantclient-devel
 Additional header files and an example Makefile for developing Oracle
@@ -65,7 +65,7 @@ applications with Instant Client.
 %package -n oracle-instantclient-jdbc
 Summary: 	Supplemental JDBC features under Instant Client
 Group:		Applications/File
-Requires: 	oracle-instantclient-basic = %version
+Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
 %description -n oracle-instantclient-jdbc
 Additional support for XA, Internationalization,
@@ -74,7 +74,7 @@ and RowSet operations under JDBC.
 %package -n oracle-instantclient-odbc
 Summary: 	Oracle  ODBC Instant Client for Linux
 Group:		Applications/File
-Requires: 	oracle-instantclient-basic = %version
+Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
 %description -n oracle-instantclient-odbc
 Oracle  ODBC Instant Client for Linux complies with 
@@ -85,7 +85,7 @@ 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 = %version
+Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
 %description -n oracle-instantclient-sqlplus
 Additional libraries and executable for running 
@@ -94,7 +94,7 @@ SQL*Plus with Instant Client.
 %package -n oracle-instantclient-tools
 Summary:	Tools for Oracle Database 11g
 Group:		Applications/File
-Requires: 	oracle-instantclient-basic = %version
+Requires: 	oracle-instantclient-basic%{?_isa} = %version
 
 %description -n oracle-instantclient-tools
 This package provides tools to be used with the Oracle Database.
@@ -104,7 +104,7 @@ It currently includes
 %package -n oracle-instantclient-precomp
 Summary:	Oracle Precompilers for Pro*C and Pro*COBOL
 Group:		Applications/File
-Requires: 	oracle-instantclient-devel = %version
+Requires: 	oracle-instantclient-devel%{?_isa} = %version
 
 %description -n oracle-instantclient-precomp
 PRECOMP Instant Client (IC) Package contains following
@@ -141,13 +141,16 @@ 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
-install -p libclntsh.so.11.1	%{buildroot}%{oradir}/lib
-install -p libnnz11.so		%{buildroot}%{oradir}/lib
-install -p libocci.so.11.1	%{buildroot}%{oradir}/lib
-install -p libociei.so		%{buildroot}%{oradir}/lib
-install -p libocijdbc11.so	%{buildroot}%{oradir}/lib
-install -p ojdbc5.jar		%{buildroot}%{oradir}/lib
+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
@@ -157,9 +160,12 @@ 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.11.1   %{buildroot}%{oradir}/lib/libocci.so
-ln -s libclntsh.so.11.1 %{buildroot}%{oradir}/lib/libclntsh.so
+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
@@ -170,12 +176,12 @@ install -p libsqlplusic.so 	%{buildroot}%{oradir}/lib
 ln -sf %{oradir}/bin/sqlplus %{buildroot}%{_bindir}/sqlplus
 
 # JDBC
-install -p libheteroxa11.so	%{buildroot}%{oradir}/lib
+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.11.1	%{buildroot}%{oradir}/lib
+install -p libsqora.so.%{mainver}	%{buildroot}%{oradir}/lib
 
 # Tools
 install -p wrc 		%{buildroot}%{oradir}/bin
@@ -209,13 +215,16 @@ rm -rf %{buildroot}
 %dir %{oradir}
 %dir %{oradir}/lib
 %dir %{oradir}/bin
-%{oradir}/lib/libclntsh.so.11.1
-%{oradir}/lib/libnnz11.so
-%{oradir}/lib/libocci.so.11.1
+%{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/libocijdbc11.so
-%{oradir}/lib/ojdbc5.jar
+%{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
@@ -225,6 +234,7 @@ rm -rf %{buildroot}
 %files -n oracle-instantclient-devel
 %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
@@ -250,7 +260,7 @@ rm -rf %{buildroot}
 %files -n oracle-instantclient-jdbc
 %defattr(-,root,root)
 %doc %{topdir}/JDBC_README
-%{oradir}/lib/libheteroxa11.so
+%{oradir}/lib/libheteroxa%{major}.so
 %{oradir}/lib/orai18n-mapping.jar
 %{oradir}/lib/orai18n.jar
 
@@ -258,7 +268,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc %{topdir}/ODBC_IC_Readme_Unix.html %{topdir}/ODBCRelnotesJA.htm %{topdir}/ODBCRelnotesUS.htm
 %doc %{topdir}/odbc_update_ini.sh
-%{oradir}/lib/libsqora.so.11.1
+%doc %{topdir}/help
+%{oradir}/lib/libsqora.so.%{mainver}
 
 %files -n oracle-instantclient-tools
 %defattr(-,root,root)
@@ -283,6 +294,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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