From cbf5aef00bc41b03fbd0e9e4c27cbe4091da0b65 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Thu, 1 Jan 2015 15:38:03 +0100
Subject: [PATCH] - move java() P: to jre-base and drop O: so multiple versions
 of java   can coexist - added O: to symlink packages

---
 oracle-java8.spec | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/oracle-java8.spec b/oracle-java8.spec
index c475048..f89a7ea 100644
--- a/oracle-java8.spec
+++ b/oracle-java8.spec
@@ -114,6 +114,7 @@ Group:		Development/Languages/Java
 Requires:	%{name}-jre-base = %{version}-%{release}
 Requires:	jpackage-utils >= 0:1.7.5-4
 Provides:	jdk(%{name})
+Obsoletes:	jdk
 
 %description jdk-base
 Java Development Kit for Linux.
@@ -130,28 +131,8 @@ Requires:	%{name}-tools = %{version}-%{release}
 Requires:	jpackage-utils >= 0:1.7.5-4
 Suggests:	%{name}-jre-X11
 Provides:	java
-Provides:	java(ClassDataVersion) = %{_classdataversion}
-Provides:	java(jaas) = %{version}
-Provides:	java(jaf) = 1.1.1
-Provides:	java(jaxp) = 1.3
-Provides:	java(jaxp_parser_impl)
-Provides:	java(jce) = %{version}
-Provides:	java(jdbc-stdext) = %{version}
-Provides:	java(jdbc-stdext) = 3.0
-Provides:	java(jmx) = 1.4
-Provides:	java(jndi) = %{version}
-Provides:	java(jsse) = %{version}
 Provides:	java1.4
 Provides:	jre = %{version}
-Obsoletes:	java(jaas)
-Obsoletes:	java(jaf)
-Obsoletes:	java(jaxp)
-Obsoletes:	java(jce)
-Obsoletes:	java(jdbc-stdext)
-Obsoletes:	java(jdbc-stdext)
-Obsoletes:	java(jmx)
-Obsoletes:	java(jndi)
-Obsoletes:	java(jsse)
 Obsoletes:	java-blackdown-jre
 Obsoletes:	jre
 
@@ -172,6 +153,17 @@ Summary:	Oracle JRE (Java Runtime Environment) for Linux
 Summary(pl.UTF-8):	Oracle JRE - środowisko uruchomieniowe Javy dla Linuksa
 Group:		Development/Languages/Java
 Requires:	jpackage-utils >= 0:1.7.5-4
+Provides:	java(ClassDataVersion) = %{_classdataversion}
+Provides:	java(jaas) = %{version}
+Provides:	java(jaf) = 1.1.1
+Provides:	java(jaxp) = 1.3
+Provides:	java(jaxp_parser_impl)
+Provides:	java(jce) = %{version}
+Provides:	java(jdbc-stdext) = %{version}
+Provides:	java(jdbc-stdext) = 3.0
+Provides:	java(jmx) = 1.4
+Provides:	java(jndi) = %{version}
+Provides:	java(jsse) = %{version}
 Provides:	jre(%{name})
 
 %description jre-base
@@ -191,6 +183,7 @@ Requires:	%{name}-jre-base = %{version}-%{release}
 Requires:	%{name}-jre-base-X11 = %{version}-%{release}
 Provides:	javaws = %{version}
 Provides:	jre-X11 = %{version}
+Obsoletes:	jre-X11
 
 %description jre-X11
 This package symlinks Oracle Java X11 libraries provided by
-- 
2.44.0