packages: oracle-instantclient-basic/oracle-instantclient-basic.spec, oracl...

baggins baggins at pld-linux.org
Fri Sep 10 12:30:51 CEST 2010


Author: baggins                      Date: Fri Sep 10 10:30:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- SDK/devel must be build here due to .so links
- use version as advertised on Oracle website
- added config scripts

---- Files affected:
packages/oracle-instantclient-basic:
   oracle-instantclient-basic.spec (1.5 -> 1.6) , oracle-instantclient-config.in (NONE -> 1.1)  (NEW), oracle-instantclient.pc.in (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/oracle-instantclient-basic/oracle-instantclient-basic.spec
diff -u packages/oracle-instantclient-basic/oracle-instantclient-basic.spec:1.5 packages/oracle-instantclient-basic/oracle-instantclient-basic.spec:1.6
--- packages/oracle-instantclient-basic/oracle-instantclient-basic.spec:1.5	Thu Sep  9 20:41:42 2010
+++ packages/oracle-instantclient-basic/oracle-instantclient-basic.spec	Fri Sep 10 12:30:45 2010
@@ -4,32 +4,41 @@
 #
 # NOTE:
 # - see "URL:" for download links
-# - if you want to build 32-bit version, you don't have to download Source1.
+# - if you want to build 32-bit version, you don't have to download Source2 and Source3
 #   Just comment it out.
-# - if you want to build 64-bit version, comment out Source0
+# - 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		i386rel		0.1
-%define		x8664rel	0.1.0-1
 Summary:	Oracle database client - common files
 Summary(pl.UTF-8):	Klient bazy danych Oracle - wspólne pliki
 Name:		oracle-instantclient-basic
-Version:	11.2
-Release:	0.1
+Version:	11.2.0.1.0
+Release:	0.8
 License:	OTN (proprietary, non-distributable)
 Group:		Applications
-Source0:	instantclient-basic-linux32-%{version}.%{i386rel}.zip
+Source0:	instantclient-basic-linux32-%{x86ver}.zip
 # NoSource0-md5:	5d8bba5d245b885dc8a6fda5ec6e6442
-Source1:	oracle-instantclient%{version}-basic-%{version}.%{x8664rel}.x86_64.zip
-# NoSource1-md5:	7d96ba339c3cb6d5ba5f2b40ed7ed02d
+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
+# http://duberga.net/dbd_oracle_instantclient_linux/oracle-instantclient-config
+Source4:	oracle-instantclient-config.in
+Source5:	oracle-instantclient.pc.in
 NoSource:	0
 NoSource:	1
+NoSource:	2
+NoSource:	3
 URL:		http://www.oracle.com/technology/software/tech/oci/instantclient/index.html
+BuildRequires:	sed
 BuildRequires:	unzip
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		srcdir	instantclient_%(echo %{version} | tr . _)
-
 %description
 Orcale Database Instant Client Package - Basic.
 All files required to run OCI, OCCI, and JDBC-OCI applications.
@@ -37,34 +46,86 @@
 %description -l pl.UTF-8
 Klient bazy danych Oracle - wspólne pliki.
 
+%package devel
+Summary:	SDK for Oracle Database Instant Client
+Group:		Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+Oracle Database Instant Client Package - SDK.
+Additional header files and an example makefile for developing
+Oracle applications with Instant Client.
+
 %prep
 %ifarch %{ix86}
-%setup -q -c -T -b 0
+%setup -q -c -T -b 0 -b 1
 %endif
 
 %ifarch %{x8664}
-%setup -q -c -T -b 1
+%setup -q -c -T -b 2 -b 3
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_datadir}/sqlplus,%{_javadir}}
-
-install %{srcdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
-install %{srcdir}/*.so* $RPM_BUILD_ROOT%{_libdir}
-install %{srcdir}/genezi $RPM_BUILD_ROOT%{_bindir}/genezi
-install %{srcdir}/adrci $RPM_BUILD_ROOT%{_bindir}/adrci
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_datadir}/sqlplus,%{_javadir}} \
+	$RPM_BUILD_ROOT{%{_examplesdir}/%{name},%{_includedir}/oracle/client} \
+	$RPM_BUILD_ROOT%{_pkgconfigdir}
+
+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
+
+%{__sed} -e 's|@@prefix@@|%{_prefix}|' \
+	-e 's|@@libdir@@|%{_libdir}|' \
+	-e 's|@@includedir@@|%{_includedir}/oracle/client|' \
+	-e 's|@@version@@|%{version}|' %{SOURCE4} > \
+		$RPM_BUILD_ROOT%{_bindir}/oracle-instantclient-config
+
+%{__sed} -e 's|@@prefix@@|%{_prefix}|' \
+	-e 's|@@libdir@@|%{_libdir}|' \
+	-e 's|@@includedir@@|%{_includedir}/oracle/client|' \
+	-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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_javadir}/*.jar
-%attr(755,root,root) %{_libdir}/*.so*
-%attr(755,root,root) %{_bindir}/genezi
+%doc instantclient_*/BASIC_README
 %attr(755,root,root) %{_bindir}/adrci
-%doc %{srcdir}/BASIC_README
+%attr(755,root,root) %{_bindir}/genezi
+%attr(755,root,root) %{_libdir}/libclntsh.so.*
+%attr(755,root,root) %{_libdir}/libocci.so.*
+%attr(755,root,root) %{_libdir}/libnnz11.so
+%attr(755,root,root) %{_libdir}/libociei.so
+%attr(755,root,root) %{_libdir}/libocijdbc11.so
+%{_javadir}/*.jar
+
+%files devel
+%defattr(644,root,root,755)
+%doc instantclient_*/sdk/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
+%{_examplesdir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -72,6 +133,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/09/10 10:30:45  baggins
+- SDK/devel must be build here due to .so links
+- use version as advertised on Oracle website
+- added config scripts
+
 Revision 1.5  2010/09/09 18:41:42  baggins
 - updated x86_64 version
 

================================================================
Index: packages/oracle-instantclient-basic/oracle-instantclient-config.in
diff -u /dev/null packages/oracle-instantclient-basic/oracle-instantclient-config.in:1.1
--- /dev/null	Fri Sep 10 12:30:51 2010
+++ packages/oracle-instantclient-basic/oracle-instantclient-config.in	Fri Sep 10 12:30:45 2010
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Oracle InstantClient SDK config file
+# Jean-Christophe Duberga - Bordeaux 2 University
+#
+
+version=@@version@@
+prefix=@@prefix@@
+exec_prefix=${prefix}
+exec_prefix_set=no
+libdir=@@libdir@@
+includedir=@@includedir@@
+
+incdirs="-I${includedir}"
+libdirs="-L${libdir}"
+
+usage="\
+Usage: oracle-instantclient-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
+
+if test $# -eq 0; then
+      echo "${usage}" 1>&2
+      exit 1
+fi
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      if test $exec_prefix_set = no ; then
+        exec_prefix=$optarg
+      fi
+      ;;
+    --prefix)
+      echo $prefix
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      exec_prefix_set=yes
+      ;;
+    --exec-prefix)
+      echo ${exec_prefix}
+      ;;
+    --version)
+      echo ${version}
+      ;;
+    --cflags)
+      echo ${incdirs}
+      ;;
+    --libs)
+      echo ${libdirs} -lclntsh -locci
+      ;;
+    --static-libs)
+      echo "No static libs" 1>&2
+      exit 1
+      ;;
+    *)
+      echo "${usage}" 1>&2
+      exit 1
+      ;;
+  esac
+  shift
+done

================================================================
Index: packages/oracle-instantclient-basic/oracle-instantclient.pc.in
diff -u /dev/null packages/oracle-instantclient-basic/oracle-instantclient.pc.in:1.1
--- /dev/null	Fri Sep 10 12:30:51 2010
+++ packages/oracle-instantclient-basic/oracle-instantclient.pc.in	Fri Sep 10 12:30:45 2010
@@ -0,0 +1,10 @@
+prefix=@@prefix@@
+exec_prefix=${prefix}
+libdir=@@libdir@@
+includedir=@@includedir@@
+
+Name: oracle-instantclient
+Description: Oracle InstantClient SDK
+Version: @@version@@
+Libs: -L${libdir} -lclntsh -locci
+Cflags: -I${includedir} 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/oracle-instantclient-basic/oracle-instantclient-basic.spec?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list