packages: java5-sun/java5-sun.spec - rel 4 - get rid of odbc hacks, libodbc...

[baggins]

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

---- Files affected:
packages/java5-sun:
   java5-sun.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: packages/java5-sun/java5-sun.spec
diff -u packages/java5-sun/java5-sun.spec:1.19 packages/java5-sun/java5-sun.spec:1.20
--- packages/java5-sun/java5-sun.spec:1.19	Fri Jan 13 22:00:05 2012
+++ packages/java5-sun/java5-sun.spec	Fri Mar  9 13:15:31 2012
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java5-sun
 Version:	%{_ver}
-Release:	3
+Release:	4
 License:	restricted, distributable
 Group:		Development/Languages/Java
 Source0:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
@@ -50,8 +50,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
 
@@ -97,13 +96,6 @@
 Summary(pl.UTF-8):	Pliki JDBC dla Javy Suna
 Group:		Development/Languages/Java
 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
 
@@ -890,6 +882,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2012/03/09 12:15:31  baggins
+- rel 4
+- get rid of odbc hacks, libodbc*.so are now in main unixODBC package
+
 Revision 1.19  2012/01/13 21:00:05  arekm
 - release 3
 
================================================================

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