commit 9beb88a0bf7734b771e156baf3e22eb25087c966 Author: Jan Palus <at...@pld-linux.org> Date: Thu Jul 15 13:27:22 2021 +0200
up to 19.10.0.0.0 - moved libclntsh.so and libocci.so to main package (apps with dynamic search for isntantclient prefer these links) oracle-instantclient-basic.spec | 66 +++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 32 deletions(-) --- diff --git a/oracle-instantclient-basic.spec b/oracle-instantclient-basic.spec index d52cdb0..8f3e005 100644 --- a/oracle-instantclient-basic.spec +++ b/oracle-instantclient-basic.spec @@ -7,24 +7,23 @@ # Just comment it out. # - if you want to build 64-bit version, comment out Source0 and Source1 -%define x86ver 11.2.0.1 -%define x8664ver 11.2.0.1.0-1 +%define vdir %(echo %{version} | cut -f1-4 -d. | tr -d .) Summary: Oracle database client - common files Summary(pl.UTF-8): Klient bazy danych Oracle - wspólne pliki Name: oracle-instantclient-basic -Version: 11.2.0.1.0 -Release: 0.8 +Version: 19.10.0.0.0 +Release: 0.1 License: OTN (proprietary, non-distributable) Group: Applications/Databases -Source0: instantclient-basic-linux32-%{x86ver}.zip -# NoSource0-md5: 5d8bba5d245b885dc8a6fda5ec6e6442 -Source1: instantclient-sdk-linux32-%{x86ver}.zip -# NoSource1-md5: 374e1986621cb83ec90d4714c5430473 -Source2: oracle-instantclient11.2-basic-%{x8664ver}.x86_64.zip -# NoSource2-md5: 7d96ba339c3cb6d5ba5f2b40ed7ed02d -Source3: oracle-instantclient11.2-sdk-%{x8664ver}.x86_64.zip -# NoSource3-md5: ee46ae0ec92397cb9b0cef4f48e0eda7 +Source0: https://download.oracle.com/otn_software/linux/instantclient/%{vdir}/instantclient-basic-linux-%{version}dbru.zip +# NoSource0-md5: 333d0ec0c3d390472de6c39c380e6f45 +Source1: https://download.oracle.com/otn_software/linux/instantclient/%{vdir}/instantclient-sdk-linux-%{version}dbru.zip +# NoSource1-md5: 076f8866146078ffe81353a857039b48 +Source2: https://download.oracle.com/otn_software/linux/instantclient/%{vdir}/instantclient-basic-linux.x64-%{version}dbru.zip +# NoSource2-md5: 88501585329ccbc7690aa20a105d2506 +Source3: https://download.oracle.com/otn_software/linux/instantclient/%{vdir}/instantclient-sdk-linux.x64-%{version}dbru.zip +# NoSource3-md5: 00aded152dcc2f26f4d8f44e6f7387d3 # http://duberga.net/dbd_oracle_instantclient_linux/oracle-instantclient-config Source4: oracle-instantclient-config.in Source5: oracle-instantclient.pc.in @@ -38,6 +37,8 @@ BuildRequires: unzip ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define no_install_post_check_so 1 + %description Orcale Database Instant Client Package - Basic. All files required to run OCI, OCCI, and JDBC-OCI applications. @@ -57,11 +58,11 @@ Oracle applications with Instant Client. %prep %ifarch %{ix86} -%setup -q -c -T -b 0 -b 1 +%setup -q -c -T -a 0 -a 1 %endif %ifarch %{x8664} -%setup -q -c -T -b 2 -b 3 +%setup -q -c -T -a 2 -a 3 %endif %install @@ -72,10 +73,10 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_datadir}/sqlplus,%{_javadir} cd instantclient_* -install *.jar $RPM_BUILD_ROOT%{_javadir} -install *.so* $RPM_BUILD_ROOT%{_libdir} -install genezi $RPM_BUILD_ROOT%{_bindir}/genezi -install adrci $RPM_BUILD_ROOT%{_bindir}/adrci +cp -p *.jar $RPM_BUILD_ROOT%{_javadir} +cp -pP *.so* $RPM_BUILD_ROOT%{_libdir} +cp -p genezi $RPM_BUILD_ROOT%{_bindir}/genezi +cp -p adrci $RPM_BUILD_ROOT%{_bindir}/adrci %{__sed} -e 's|@@prefix@@|%{_prefix}|' \ -e 's|@@libdir@@|%{_libdir}|' \ @@ -89,15 +90,10 @@ install adrci $RPM_BUILD_ROOT%{_bindir}/adrci -e 's|@@version@@|%{version}|' %{SOURCE5} > \ $RPM_BUILD_ROOT%{_pkgconfigdir}/oracle-instantclient.pc -install sdk/ottclasses.zip $RPM_BUILD_ROOT%{_javadir} -install sdk/ott $RPM_BUILD_ROOT%{_bindir} -install sdk/include/* $RPM_BUILD_ROOT%{_includedir}/oracle/client -install sdk/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name} - -cd $RPM_BUILD_ROOT%{_libdir} -for ff in lib*.so.* ; do - ln -s $ff ${ff:%%.so.*}.so -done +cp -p sdk/ottclasses.zip $RPM_BUILD_ROOT%{_javadir} +cp -p sdk/ott $RPM_BUILD_ROOT%{_bindir} +cp -p sdk/include/* $RPM_BUILD_ROOT%{_includedir}/oracle/client +cp -p sdk/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -107,20 +103,26 @@ rm -rf $RPM_BUILD_ROOT %doc instantclient_*/BASIC_README %attr(755,root,root) %{_bindir}/adrci %attr(755,root,root) %{_bindir}/genezi +%attr(755,root,root) %{_libdir}/libclntsh.so %attr(755,root,root) %{_libdir}/libclntsh.so.* +%attr(755,root,root) %{_libdir}/libclntshcore.so.* +%ifarch %{x8664} +%attr(755,root,root) %{_libdir}/libipc1.so +%attr(755,root,root) %{_libdir}/libmql1.so +%endif +%attr(755,root,root) %{_libdir}/libocci.so %attr(755,root,root) %{_libdir}/libocci.so.* -%attr(755,root,root) %{_libdir}/libnnz11.so +%attr(755,root,root) %{_libdir}/libnnz19.so %attr(755,root,root) %{_libdir}/libociei.so -%attr(755,root,root) %{_libdir}/libocijdbc11.so +%attr(755,root,root) %{_libdir}/libocijdbc19.so +%attr(755,root,root) %{_libdir}/liboramysql19.so %{_javadir}/*.jar %files devel %defattr(644,root,root,755) -%doc instantclient_*/sdk/SDK_README +%doc instantclient_*/SDK_README %attr(755,root,root) %{_bindir}/oracle-instantclient-config %attr(755,root,root) %{_bindir}/ott -%attr(755,root,root) %{_libdir}/libclntsh.so -%attr(755,root,root) %{_libdir}/libocci.so %{_pkgconfigdir}/oracle-instantclient.pc %{_includedir}/oracle/client %{_javadir}/*.zip ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/oracle-instantclient-basic.git/commitdiff/da4dd65720ff9cba239547ab2b265e0fe31cc61c _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit