diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63e96a481a399060cb5120d743c48811a143d491..1297d861b980e825c90615a1c583d7bcf33fae61 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 diff --git a/oracle-instantclient.spec b/oracle-instantclient.spec index a9ef5aa5b28afd0725367fc496141e7a7d073ad2..84910500be21e6b90696ceb41ed104ea008afd07 100644 --- a/oracle-instantclient.spec +++ b/oracle-instantclient.spec @@ -9,8 +9,8 @@ Name: cern-%{pkgname} Name: %{pkgname} %endif% Summary: META package for the ORACLE instantclient -Version: 19.3 -Release: 4%{?dist} +Version: 19.9 +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 - 19.9-1 +- bump to version 19.9 + * Wed Mar 04 2020 Ben Morrice - 19.3-4 - build for C8 diff --git a/src/pcscfg.cfg-19.9.fix b/src/pcscfg.cfg-19.9.fix new file mode 100644 index 0000000000000000000000000000000000000000..2910e7cb1f56f3ddfbcaf22363e24b5f533f2d23 --- /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__