SPECS: java-sun.spec - dep loop between -jre and -tools

[glen]

Author: glen                         Date: Tue Nov 11 18:39:56 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dep loop between -jre and -tools

---- Files affected:
SPECS:
   java-sun.spec (1.211 -> 1.212) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.211 SPECS/java-sun.spec:1.212
--- SPECS/java-sun.spec:1.211	Thu Jul 24 00:12:05 2008
+++ SPECS/java-sun.spec	Tue Nov 11 19:39:51 2008
@@ -8,6 +8,8 @@
 #   /usr/lib/jvm/java-sun-1.6.0.10/jre/lib/fontconfig.RedHat.4.properties.src
 #   /usr/lib/jvm/java-sun-1.6.0.10/jre/lib/servicetag/jdk_header.png
 #   /usr/share/man/ja/man1/jvisualvm.1.gz
+# - dep loop (can be solved by moving shared libs to java-sun-libs):
+#   java-sun-jre>java-sun-tools
 #
 %define		_enable_debug_packages 0
 #
@@ -19,7 +21,7 @@
 Summary(pl.UTF-8):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	1.6.0.10
-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
@@ -118,6 +120,7 @@
 Group:		Development/Languages/Java
 Requires:	java-jre-tools
 Requires:	jpackage-utils >= 0:1.6.6-14
+Requires:	rpm-whiteout >= 1.8
 Provides:	j2re = %{version}
 Provides:	jaas = %{version}
 Provides:	jaf = 1.1.1
@@ -196,6 +199,7 @@
 Summary(pl.UTF-8):	Współdzielone narzędzia Javy
 Group:		Development/Languages/Java
 Requires:	%{name}-jre = %{version}-%{release}
+Requires:	rpm-whiteout >= 1.8
 Provides:	jar
 Provides:	java-jre-tools
 Provides:	java-shared
@@ -863,6 +867,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212  2008/11/11 18:39:51  glen
+- dep loop between -jre and -tools
+
 Revision 1.211  2008/07/23 22:12:05  glen
 - unpackaged files todo
 
@@ -953,8 +960,8 @@
 
 Revision 1.185  2007/08/05 20:08:19  arekm
 - up to u2
-[fixes CVE-2007-2788 CVE-2007-2789 CVE-2007-3004 CVE-2007-3005
- CVE-2007-3503 CVE-2007-3655 CVE-2007-3698 CVE-2007-3716 CVE-2007-3922]
+  [fixes CVE-2007-2788 CVE-2007-2789 CVE-2007-3004 CVE-2007-3005
+  CVE-2007-3503 CVE-2007-3655 CVE-2007-3698 CVE-2007-3716 CVE-2007-3922]
 
 Revision 1.184  2007/04/17 20:59:20  glen
 - url for dlj
================================================================

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