precomp/admin/pcscfg.cfg patch is arch dependant, create two patches

diff --git a/oracle-instantclient.spec b/oracle-instantclient.spec
index 48a46485419df3c810df78f8c08b793051c8bda9..c8391cb97af1f00c377baca1cf0073be7249e792 100644 (file)
--- a/oracle-instantclient.spec
+++ b/oracle-instantclient.spec
@@ -64,7 +64,8 @@ NoSource:     17
 # http://duberga.net/dbd_oracle_instantclient_linux/oracle-instantclient-config
 Source20:      oracle-instantclient-config.in
 Source21:      oracle-instantclient.pc.in
-Patch0:                %{name}-proc-includes.patch
+Patch0:                proc-includes32.patch
+Patch1:                proc-includes64.patch
 URL:           http://www.oracle.com/technetwork/database/features/instant-client/
 BuildRequires: sed
 BuildRequires: unzip
@@ -182,14 +183,14 @@ to precompile a Pro*C application and demo.
 %prep
 %ifarch %{ix86}
 %setup -qcT -b %{?with_lite:1}%{!?with_lite:0} -b 2 -b 3 -b 4 -b 5 -b 6 -b 7
+%patch0 -p1
 %endif
 %ifarch %{x8664}
 %setup -qcT -b %{?with_lite:11}%{!?with_lite:10} -b 12 -b 13 -b 14 -b 15 -b 16 -b 17
+%patch1 -p1
 %endif
 mv instantclient_*/* .
 
-%patch0 -p1
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_datadir}/sqlplus/admin} \

diff --git a/proc-includes32.patch b/proc-includes32.patch
new file mode 100644 (file)
index 0000000..a6a90a7
--- /dev/null
+++ b/proc-includes32.patch
@@ -0,0 +1,6 @@
+--- oracle-instantclient-12.1.0.1.0/instantclient_12_1/precomp/admin/pcscfg.cfg~       2013-05-27 07:49:02.000000000 +0000
++++ oracle-instantclient-12.1.0.1.0/instantclient_12_1/precomp/admin/pcscfg.cfg        2014-04-06 21:14:04.807265844 +0000
+@@ -1,2 +1,2 @@
+-sys_include=($ORACLE_HOME/sdk/include,/usr/include,/usr/lib/gcc/i386-redhat-linux/4.1.2/include,/usr/lib/gcc/i386-redhat-linux/3.4.6/include,/usr/lib/gcc/i586-suse-linux/4.3/include,/usr/lib/gcc/i586-suse-linux/4.1.2/include)
++sys_include=(/usr/include/oracle/client,$ORACLE_HOME/sdk/include,/usr/include,@GCC_SYS_INC_DIR@)
+ ltype=short

diff --git a/oracle-instantclient-proc-includes.patch b/proc-includes64.patch
similarity index 62%
rename from oracle-instantclient-proc-includes.patch
rename to proc-includes64.patch
index 8671b65d78c768c7ca1f4bc8c0f8230b31d0cddc..b992355f3f62cda3e52dfc51fc37bab322763a10 100644 (file)
--- a/oracle-instantclient-proc-includes.patch
+++ b/proc-includes64.patch
@@ -1,5 +1,5 @@
---- oracle-instantclient-12.1.0.1.0/precomp/admin/pcscfg.cfg~  2013-05-24 20:20:51.000000000 +0300
-+++ oracle-instantclient-12.1.0.1.0/precomp/admin/pcscfg.cfg   2014-04-06 23:53:16.569452168 +0300
+--- oracle-instantclient-12.1.0.1.0/instantclient_12_1/precomp/admin/pcscfg.cfg~       2013-05-24 20:20:51.000000000 +0300
++++ oracle-instantclient-12.1.0.1.0/instantclient_12_1/precomp/admin/pcscfg.cfg        2014-04-06 23:53:16.569452168 +0300
 @@ -1,3 +1,3 @@
 -sys_include=($ORACLE_HOME/sdk/include,/usr/include,/usr/lib/gcc/x86_64-redhat-linux/4.1.2/include,/usr/lib/gcc/x86_64-redhat-linux/4.4.6/include,/usr/lib64/gcc/x86_64-suse-linux/4.1.2/include,/usr/lib64/gcc/x86_64-suse-linux/4.3/include)
 +sys_include=(/usr/include/oracle/client,$ORACLE_HOME/sdk/include,/usr/include,@GCC_SYS_INC_DIR@)