rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.9,1.10

Lillian Angel (langel) fedora-extras-commits at redhat.com
Fri Mar 14 16:36:27 UTC 2008


Author: langel

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

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:

 Mar 14 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.4.b06
- Fixed Provides and Obsoletes for all sub-packages. Should have specified
java-1.7.0-icedtea < 1.7.0.0-0.999 instead of 1.7.0-0.999.
- Resolves: rhbz#437492



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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- java-1.6.0-openjdk.spec	12 Mar 2008 21:22:52 -0000	1.9
+++ java-1.6.0-openjdk.spec	14 Mar 2008 16:35:53 -0000	1.10
@@ -192,8 +192,8 @@
 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
+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}
@@ -230,8 +230,8 @@
 Requires(postun): %{_sbindir}/alternatives
 
 # java-1.6.0-openjdk-devel replaces java-1.7.0-icedtea-devel
-Provides: java-1.7.0-icedtea-devel = 0:1.7.0-0.999
-Obsoletes: java-1.7.0-icedtea-devel < 0:1.7.0-0.999
+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}
@@ -252,8 +252,8 @@
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
 # java-1.6.0-openjdk-demo replaces java-1.7.0-icedtea-demo
-Provides: java-1.7.0-icedtea-demo = 0:1.7.0-0.999
-Obsoletes: java-1.7.0-icedtea-demo < 0:1.7.0-0.999
+Provides: java-1.7.0-icedtea-demo = 0:1.7.0.0-0.999
+Obsoletes: java-1.7.0-icedtea-demo < 0:1.7.0.0-0.999
 
 %description demo
 The OpenJDK demos.
@@ -265,8 +265,8 @@
 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.999
-Obsoletes: java-1.7.0-icedtea-src < 0:1.7.0-0.999
+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.
@@ -281,8 +281,8 @@
 Requires(postun): %{_sbindir}/alternatives
 
 # java-1.6.0-openjdk-javadoc replaces java-1.7.0-icedtea-javadoc
-Provides: java-1.7.0-icedtea-javadoc = 0:1.7.0-0.999
-Obsoletes: java-1.7.0-icedtea-javadoc < 0:1.7.0-0.999
+Provides: java-1.7.0-icedtea-javadoc = 0:1.7.0.0-0.999
+Obsoletes: java-1.7.0-icedtea-javadoc < 0:1.7.0.0-0.999
 
 # Standard JPackage javadoc provides.
 Provides: java-javadoc = %{epoch}:%{version}-%{release}
@@ -303,8 +303,8 @@
 Requires(postun): %{_sbindir}/alternatives
 
 # java-1.6.0-openjdk-plugin replaces java-1.7.0-icedtea-plugin
-Provides: java-1.7.0-icedtea-plugin = 0:1.7.0-0.999
-Obsoletes: java-1.7.0-icedtea-plugin < 0:1.7.0-0.999
+Provides: java-1.7.0-icedtea-plugin = 0:1.7.0.0-0.999
+Obsoletes: java-1.7.0-icedtea-plugin < 0:1.7.0.0-0.999
 
 # Standard JPackage plugin provides.
 Provides: java-plugin = %{javaver}
@@ -785,6 +785,11 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Fri Mar 14 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.4.b06
+- Fixed Provides and Obsoletes for all sub-packages. Should have specified
+java-1.7.0-icedtea < 1.7.0.0-0.999 instead of 1.7.0-0.999.
+- Resolves: rhbz#437492
+
 * Wed Mar 12 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.4.b06
 - Add FIXME about versionless SONAMEs.
 




More information about the fedora-extras-commits mailing list