[packages/oracle-java8] - P:/O: jdk should be in main package

[atler]

commit 8c80391e5fb7f7eca57ab38c0a0a1031f994fb90
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Jan 21 08:56:45 2015 +0100

    - P:/O: jdk should be in main package

 oracle-java8.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/oracle-java8.spec b/oracle-java8.spec
index d2455a8..df084e3 100644
--- a/oracle-java8.spec
+++ b/oracle-java8.spec
@@ -50,9 +50,11 @@ Requires:	%{name}-jdk-base = %{version}-%{release}
 Requires:	%{name}-jre = %{version}-%{release}
 Requires:	%{name}-jre-base = %{version}-%{release}
 Provides:	j2sdk = %{version}
+Provides:	jdk = %{version}
 Obsoletes:	blackdown-java-sdk
 Obsoletes:	ibm-java
 Obsoletes:	java-blackdown
+Obsoletes:	jdk
 Obsoletes:	kaffe
 Conflicts:	netscape4-plugin-java
 ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664}
@@ -111,9 +113,7 @@ Summary(pl.UTF-8):	Oracle JDK - środowisko programistyczne Javy dla Linuksa
 Group:		Development/Languages/Java
 Requires:	%{name}-jre-base = %{version}-%{release}
 Requires:	jpackage-utils >= 0:1.7.5-5
-Provides:	jdk = %{version}
 Provides:	jdk(%{name})
-Obsoletes:	jdk
 
 %description jdk-base
 Java Development Kit for Linux.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/oracle-java8.git/commitdiff/8c80391e5fb7f7eca57ab38c0a0a1031f994fb90