packages: oracle-instantclient/oracle-instantclient.spec - rel 2 - rename l...

[baggins]

Author: baggins                      Date: Fri Sep 10 19:14:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- rename ldap.h

---- Files affected:
packages/oracle-instantclient:
   oracle-instantclient.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/oracle-instantclient/oracle-instantclient.spec
diff -u packages/oracle-instantclient/oracle-instantclient.spec:1.2 packages/oracle-instantclient/oracle-instantclient.spec:1.3
--- packages/oracle-instantclient/oracle-instantclient.spec:1.2	Fri Sep 10 13:49:07 2010
+++ packages/oracle-instantclient/oracle-instantclient.spec	Fri Sep 10 21:14:07 2010
@@ -9,7 +9,7 @@
 Summary:	Oracle Database Instant Client
 Name:		oracle-instantclient
 Version:	11.2.0.1.0
-Release:	1
+Release:	2
 License:	OTN (proprietary, non-distributable)
 Group:		Applications/Databases
 Source0:	instantclient-basic-linux32-%{x86ver}.zip
@@ -188,6 +188,9 @@
 install -p sdk/include/* $RPM_BUILD_ROOT%{_includedir}/oracle/client
 install -p sdk/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}
 
+# rename to avoid clash with openldap header or php build will suffer
+mv $RPM_BUILD_ROOT%{_includedir}/oracle/client/{ldap.h,oraldap.h}
+
 cd $RPM_BUILD_ROOT%{_libdir}
 for ff in lib*.so.* ; do
 	ln -s $ff ${ff:%%.so.*}.so
@@ -294,6 +297,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/09/10 19:14:07  baggins
+- rel 2
+- rename ldap.h
+
 Revision 1.2  2010/09/10 11:49:07  baggins
 - rel 1
 
================================================================

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