[java-1.6.0-openjdk] all related provides changed to "6" (eg jre->jre6) as java 7 is now Java

[jiri vanek]

commit 0c51d9c40b31d1dec09997470efb3bc0d44af198
Author: Jiri Vanek work <jvanek at judovana.home>
Date:   Tue Jan 31 18:41:46 2012 +0100

    all related provides changed to "6" (eg jre->jre6) as java 7 is now Java

 java-1.6.0-openjdk.spec |   55 ++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 29 deletions(-)
---
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index bf589ed..4a3cf38 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -255,25 +255,25 @@ Provides: java-1.7.0-icedtea = 0:1.7.0.0-0.999
 Obsoletes: java-1.7.0-icedtea < 0:1.7.0.0-0.999
 
 # Standard JPackage base provides.
-Provides: jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
-Provides: jre-%{origin} = %{epoch}:%{version}-%{release}
-Provides: jre-%{javaver} = %{epoch}:%{version}-%{release}
-Provides: java-%{javaver} = %{epoch}:%{version}-%{release}
-Provides: jre = %{javaver}
-Provides: java-%{origin} = %{epoch}:%{version}-%{release}
-Provides: java = %{epoch}:%{javaver}
+Provides: jre6-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
+Provides: jre6-%{origin} = %{epoch}:%{version}-%{release}
+Provides: jre6-%{javaver} = %{epoch}:%{version}-%{release}
+Provides: java6-%{javaver} = %{epoch}:%{version}-%{release}
+Provides: jre6 = %{javaver}
+Provides: java6-%{origin} = %{epoch}:%{version}-%{release}
+Provides: java6 = %{epoch}:%{javaver}
 # Standard JPackage extensions provides.
-Provides: jndi = %{epoch}:%{version}
-Provides: jndi-ldap = %{epoch}:%{version}
-Provides: jndi-cos = %{epoch}:%{version}
-Provides: jndi-rmi = %{epoch}:%{version}
-Provides: jndi-dns = %{epoch}:%{version}
-Provides: jaas = %{epoch}:%{version}
-Provides: jsse = %{epoch}:%{version}
-Provides: jce = %{epoch}:%{version}
-Provides: jdbc-stdext = 3.0
-Provides: java-sasl = %{epoch}:%{version}
-Provides: java-fonts = %{epoch}:%{version}
+Provides: jndi6 = %{epoch}:%{version}
+Provides: jndi6-ldap = %{epoch}:%{version}
+Provides: jndi6-cos = %{epoch}:%{version}
+Provides: jndi6-rmi = %{epoch}:%{version}
+Provides: jndi6-dns = %{epoch}:%{version}
+Provides: jaas6 = %{epoch}:%{version}
+Provides: jsse6 = %{epoch}:%{version}
+Provides: jce6 = %{epoch}:%{version}
+Provides: jdbc6-stdext = 3.0
+Provides: java6-sasl = %{epoch}:%{version}
+Provides: java6-fonts = %{epoch}:%{version}
 
 %description
 The OpenJDK runtime environment.
@@ -294,13 +294,13 @@ Provides: java-1.7.0-icedtea-devel = 0:1.7.0.0-0.999
 Obsoletes: java-1.7.0-icedtea-devel < 0:1.7.0.0-0.999
 
 # Standard JPackage devel provides.
-Provides: java-sdk-%{javaver}-%{origin} = %{epoch}:%{version}
-Provides: java-sdk-%{javaver} = %{epoch}:%{version}
-Provides: java-sdk-%{origin} = %{epoch}:%{version}
-Provides: java-sdk = %{epoch}:%{javaver}
-Provides: java-%{javaver}-devel = %{epoch}:%{version}
-Provides: java-devel-%{origin} = %{epoch}:%{version}
-Provides: java-devel = %{epoch}:%{javaver}
+Provides: java6-sdk-%{javaver}-%{origin} = %{epoch}:%{version}
+Provides: java6-sdk-%{javaver} = %{epoch}:%{version}
+Provides: java6-sdk-%{origin} = %{epoch}:%{version}
+Provides: java6-sdk = %{epoch}:%{javaver}
+Provides: java6-%{javaver}-devel = %{epoch}:%{version}
+Provides: java6-devel-%{origin} = %{epoch}:%{version}
+Provides: java6-devel = %{epoch}:%{javaver}
 
 %description devel
 The OpenJDK development tools.
@@ -324,10 +324,6 @@ Group:   Development/Languages
 
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
-# java-1.6.0-openjdk-src replaces java-1.7.0-icedtea-src.
-Provides: java-1.7.0-icedtea-src = 0:1.7.0.0-0.999
-Obsoletes: java-1.7.0-icedtea-src < 0:1.7.0.0-0.999
-
 %description src
 The OpenJDK source bundle.
 
@@ -889,6 +885,7 @@ exit 0
 %changelog
 * Tue Jan 31 2012 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-65.1.11
 - IcedTea6 bumped to 1.11 release
+- Provide a "6" version of items to enforce F-17 policy of Java 7 builds are prior
 - full release info at:
   http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-January/017060.html
 - removed and deleted patches: