From 5b9ec6102acfe2f1200de09e373bda884cc8d94f Mon Sep 17 00:00:00 2001
From: Daniel Juarez <daniel.juarez.gonzalez@cern.ch>
Date: Mon, 9 Nov 2020 16:28:35 +0000
Subject: [PATCH 1/4] Upgrade to use 19.9
---
oracle-instantclient.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oracle-instantclient.spec b/oracle-instantclient.spec
index a9ef5aa..c681640 100644
--- a/oracle-instantclient.spec
+++ b/oracle-instantclient.spec
@@ -9,7 +9,7 @@ Name: cern-%{pkgname}
Name: %{pkgname}
%endif%
Summary: META package for the ORACLE instantclient
-Version: 19.3
+Version: 19.9
Release: 4%{?dist}
Epoch: 2
Source1: oracle-instantclient11.2-x86_64.conf
--
GitLab
From 923983b22d2b873febdcb3e79dd32d0fde41541f Mon Sep 17 00:00:00 2001
From: Daniel Juarez <daniel.juarez.gonzalez@cern.ch>
Date: Mon, 9 Nov 2020 16:35:11 +0000
Subject: [PATCH 2/4] bump to version 19.9
---
oracle-instantclient.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/oracle-instantclient.spec b/oracle-instantclient.spec
index c681640..8491050 100644
--- a/oracle-instantclient.spec
+++ b/oracle-instantclient.spec
@@ -10,7 +10,7 @@ Name: %{pkgname}
%endif%
Summary: META package for the ORACLE instantclient
Version: 19.9
-Release: 4%{?dist}
+Release: 1%{?dist}
Epoch: 2
Source1: oracle-instantclient11.2-x86_64.conf
Source2: oracle-instantclient12.2-x86_64.conf
@@ -358,6 +358,10 @@ exit 0
%changelog
+
+* Mon Nov 09 2020 Daniel Juarez <djuarezg@cern.ch> - 19.9-1
+- bump to version 19.9
+
* Wed Mar 04 2020 Ben Morrice <ben.morrice@cern.ch> - 19.3-4
- build for C8
--
GitLab
From 4567b97350e07f4835120cad88fac7a229570ccc Mon Sep 17 00:00:00 2001
From: Daniel Juarez <daniel.juarez.gonzalez@cern.ch>
Date: Mon, 9 Nov 2020 16:38:11 +0000
Subject: [PATCH 3/4] missing cfg fix file
---
src/pcscfg.cfg-19.9.fix | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 src/pcscfg.cfg-19.9.fix
diff --git a/src/pcscfg.cfg-19.9.fix b/src/pcscfg.cfg-19.9.fix
new file mode 100644
index 0000000..2910e7c
--- /dev/null
+++ b/src/pcscfg.cfg-19.9.fix
@@ -0,0 +1,3 @@
+sys_include=($ORACLE_HOME/sdk/include,/usr/include,/usr/lib/gcc/x86_64-redhat-linux/4.8.2/include/,/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/)
+ltype=short
+define=__x86_64__
--
GitLab
From f8321d1bd3e38f0ee7fa3167b50d0a941d88d3ce Mon Sep 17 00:00:00 2001
From: Daniel Juarez <daniel.juarez.gonzalez@cern.ch>
Date: Tue, 10 Nov 2020 10:22:35 +0000
Subject: [PATCH 4/4] We obviously need the oracle-release pkg, use test rpm
for now
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 63e96a4..1297d86 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,5 +19,7 @@ include: 'https://gitlab.cern.ch/linuxsupport/rpmci/raw/master/rpm-ci.yml'
.test_install:
before_script:
- if [ `rpm --eval %{dist}` == ".el8" ]; then yum-config-manager --add-repo "http://linuxsoft.cern.ch/internal/repos/dbclients8-stable/x86_64/os/"; fi
+ #- if [ `rpm --eval %{dist}` == ".el8" ]; then yum install -y oracle-release; fi
+ - if [ `rpm --eval %{dist}` == ".el8" ]; then yum install -y https://koji.cern.ch/kojifiles/packages/oracle-release/1.2/1.el8.cern/noarch/oracle-release-1.2-1.el8.cern.noarch.rpm; fi
# test installing all binary meta packages except basiclite and compat, as these conflicts with 'basic' and 'devel'
- if [ `rpm --eval %{dist}` == ".el8" ]; then yum install -y --nogpgcheck `ls koji/*oracle-instantclient*x86_64.rpm |egrep -v 'basiclite|compat'`; else yum install -y --enablerepo=cernonly,cernonly-testing `ls koji/*oracle-instantclient*x86_64.rpm |egrep -v 'basiclite|compat'`; fi
--
GitLab