rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.2,1.3

[Lillian Angel (langel)]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7286

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Tue Mar 11 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.2.b06
- Added Provides and Obsoletes. This package replaces java-1.7.0-icedtea.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.6.0-openjdk.spec	10 Mar 2008 15:11:44 -0000	1.2
+++ java-1.6.0-openjdk.spec	11 Mar 2008 18:05:41 -0000	1.3
@@ -101,7 +101,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.1.%{openjdkver}%{?dist}
+Release: 0.2.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -191,6 +191,10 @@
 # Postun requires alternatives to uninstall tool alternatives.
 Requires(postun): %{_sbindir}/alternatives
 
+# java-1.6.0-openjdk replaces java-1.7.0-icedtea
+Provides: java-1.7.0-icedtea = 0:1.7.0-0.999
+Obsoletes: java-1.7.0-icedtea < 0:1.7.0-0.999
+
 # Standard JPackage base provides.
 Provides: jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
 Provides: jre-%{origin} = %{epoch}:%{version}-%{release}
@@ -754,6 +758,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Tue Mar 11 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.2.b06
+- Added Provides and Obsoletes. This package replaces java-1.7.0-icedtea.
+
 * Fri Feb 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.1.b06
 - Adapted for java-1.6.0-openjdk.