packages: icedtea6/icedtea6.spec - S: -jre-X11 moved from -jre to the main ...

[jajcus]

Author: jajcus                       Date: Fri Apr 16 12:00:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- S: -jre-X11 moved from -jre to the main package to break a dependency loop

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.35 packages/icedtea6/icedtea6.spec:1.36
--- packages/icedtea6/icedtea6.spec:1.35	Fri Apr 16 13:27:43 2010
+++ packages/icedtea6/icedtea6.spec	Fri Apr 16 13:59:57 2010
@@ -63,8 +63,10 @@
 %{?with_plugin:BuildRequires:	xulrunner-devel}
 BuildRequires:	zip
 BuildRequires:	zlib-devel
+Suggests:	browser-plugin-java-%{name}
 Requires:	%{name}-appletviewer = %{version}-%{release}
 Requires:	%{name}-jdk = %{version}-%{release}
+Suggests:	%{name}-jre-X11
 Obsoletes:	java-gcj-compat
 Obsoletes:	java-gcj-compat-devel
 Obsoletes:	java-sun
@@ -74,8 +76,6 @@
 Obsoletes:	java-sun-jre-jdbc
 Obsoletes:	java-sun-sources
 Obsoletes:	java-sun-tools
-# redudant with the same in %{name}-jre, but seems needed for clean java-sun replacement
-Suggests:	browser-plugin-java-%{name}
 Obsoletes:	java-sun-jre
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -157,7 +157,6 @@
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath - środowisko uruchomieniowe
 Group:		Development/Languages/Java
 Requires:	%{name}-jre-base = %{version}-%{release}
-Suggests:	%{name}-jre-X11
 Provides:	j2re = %{_jdkversion}
 Provides:	java
 Provides:	java1.4
@@ -807,6 +806,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2010/04/16 11:59:57  jajcus
+- S: -jre-X11 moved from -jre to the main package to break a dependency loop
+
 Revision 1.35  2010/04/16 11:27:43  pawelz
 - rewrapped %descriptions
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.35&r2=1.36&f=u