packages: java-sun/java-sun.spec - rel 3 - get rid of odbc hacks, libodbc*....

[baggins]

Author: baggins                      Date: Fri Mar  9 11:57:23 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- get rid of odbc hacks, libodbc*.so are now in main unixODBC package

---- Files affected:
packages/java-sun:
   java-sun.spec (1.286 -> 1.287) 

---- Diffs:

================================================================
Index: packages/java-sun/java-sun.spec
diff -u packages/java-sun/java-sun.spec:1.286 packages/java-sun/java-sun.spec:1.287
--- packages/java-sun/java-sun.spec:1.286	Fri Feb 24 10:08:18 2012
+++ packages/java-sun/java-sun.spec	Fri Mar  9 12:57:18 2012
@@ -20,7 +20,7 @@
 Summary(pl.UTF-8):	Oracle JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	1.6.0.31
-Release:	2
+Release:	3
 License:	restricted, distributable
 Group:		Development/Languages/Java
 Source0:	http://download.oracle.com/otn-pub/java/jdk/%{_src_ver}-%{_sub_ver}/jdk-%{_src_ver}-linux-i586.bin
@@ -65,8 +65,7 @@
 # rpm doesn't like strange version definitions provided by Sun's libs
 %define		_noautoprov	'\\.\\./.*' '/export/.*'
 # these with SUNWprivate.* are found as required, but not provided
-# the rest is because -jdbc wants unixODBC-devel(?)
-%define		_noautoreq	'libjava.so(SUNWprivate_1.1)' 'libnet.so(SUNWprivate_1.1)' 'libverify.so(SUNWprivate_1.1)' 'libodbcinst.so' 'libodbc.so' 'libjava_crw_demo_g\.so.*' 'libmawt.so' 'java(ClassDataVersion)'
+%define		_noautoreq	'libjava.so(SUNWprivate_1.1)' 'libnet.so(SUNWprivate_1.1)' 'libverify.so(SUNWprivate_1.1)' 'libjava_crw_demo_g\.so.*' 'libmawt.so' 'java(ClassDataVersion)'
 # don't depend on other JRE/JDK installed on build host
 %define		_noautoreqdep	libjava.so libjvm.so
 
@@ -117,13 +116,6 @@
 Group:		Development/Languages/Java
 Requires:	%{name}-jre = %{version}-%{release}
 Requires:	%{name}-jre-base = %{version}-%{release}
-%ifarch %{x8664}
-Requires:	libodbc.so.1()(64bit)
-Requires:	libodbcinst.so.1()(64bit)
-%else
-Requires:	libodbc.so.1
-Requires:	libodbcinst.so.1
-%endif
 Provides:	%{name}-jdbc
 Obsoletes:	java-sun-jdbc
 
@@ -1009,6 +1001,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.287  2012/03/09 11:57:18  baggins
+- rel 3
+- get rid of odbc hacks, libodbc*.so are now in main unixODBC package
+
 Revision 1.286  2012/02/24 09:08:18  baggins
 - rel 2
 - don't obsolete jaxp_parser_impl as it plays badly with java-xerces
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-sun/java-sun.spec?r1=1.286&r2=1.287&f=u