packages: java-sun/java-sun.spec - "jre-* R: jre" (we don't want to allow p...

[pawelz]

Author: pawelz                       Date: Fri May 21 12:21:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- "jre-* R: jre" (we don't want to allow parallel installation of jre and
  jre-X11 from different JDKs)
- is "jre-* R: jre-base" still required?

---- Files affected:
packages/java-sun:
   java-sun.spec (1.267 -> 1.268) 

---- Diffs:

================================================================
Index: packages/java-sun/java-sun.spec
diff -u packages/java-sun/java-sun.spec:1.267 packages/java-sun/java-sun.spec:1.268
--- packages/java-sun/java-sun.spec:1.267	Sat Apr 24 00:03:58 2010
+++ packages/java-sun/java-sun.spec	Fri May 21 14:21:34 2010
@@ -111,6 +111,7 @@
 Summary:	JDBC files for Sun Java
 Summary(pl.UTF-8):	Pliki JDBC dla Javy Suna
 Group:		Development/Languages/Java
+Requires:	%{name}-jre = %{version}-%{release}
 Requires:	%{name}-jre-base = %{version}-%{release}
 %ifarch %{x8664}
 Requires:	libodbc.so.1()(64bit)
@@ -195,6 +196,7 @@
 Summary:	Sun JRE (Java Runtime Environment) for Linux, X11 related parts
 Summary(pl.UTF-8):	Sun JRE - środowisko uruchomieniowe Javy dla Linuksa, części korzystające z X11
 Group:		Development/Languages/Java
+Requires:	%{name}-jre = %{version}-%{release}
 Requires:	%{name}-jre-base = %{version}-%{release}
 Requires:	%{name}-jre-base-X11 = %{version}-%{release}
 Provides:	javaws = %{version}
@@ -1010,6 +1012,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.268  2010/05/21 12:21:34  pawelz
+- "jre-* R: jre" (we don't want to allow parallel installation of jre and
+  jre-X11 from different JDKs)
+- is "jre-* R: jre-base" still required?
+
 Revision 1.267  2010/04/23 22:03:58  pawelz
 - fixed desc: s/java5/java/ (to much copy-paste?)
 - some adapterization
================================================================

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