commit e063cb6d629ff7a349f53b9b8e3aa80eac7234c6
Author: Jacek Konieczny <[email protected]>
Date: Fri Apr 16 11:59:57 2010 +0000
- S: -jre-X11 moved from -jre to the main package to break a dependency loop
Changed files:
icedtea6.spec -> 1.36
icedtea6.spec | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 91b20f7..7dcab80 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -62,8 +62,10 @@ BuildRequires: xorg-proto-xproto-devel
%{?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
@@ -73,8 +75,6 @@ Obsoletes: java-sun-jre-alsa
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)
@@ -156,7 +156,6 @@ Summary: OpenJDK and GNU Classpath code - runtime
environment
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
