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

[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-serv7936

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 for all subpackages. All sub-packages
replaces java-1.7.0-icedtea.
- Updated Release.
- Changed BuildRequires from java-1.7.0-icedtea to java-1.6.0-openjdk.
- Added TRADEMARK file to docs.




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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- java-1.6.0-openjdk.spec	11 Mar 2008 18:05:41 -0000	1.3
+++ java-1.6.0-openjdk.spec	11 Mar 2008 18:26:47 -0000	1.4
@@ -1,6 +1,6 @@
 # If gcjbootstrap is 1 IcedTea is bootstrapped against
 # java-1.5.0-gcj-devel.  If gcjbootstrap is 0 IcedTea is built against
-# java-1.7.0-icedtea-devel.
+# java-1.6.0-openjdk-devel.
 %define gcjbootstrap 0
 
 %define icedteaver 1.0
@@ -155,7 +155,7 @@
 %if %{gcjbootstrap}
 BuildRequires: java-1.5.0-gcj-devel
 %else
-BuildRequires: java-1.7.0-icedtea-devel
+BuildRequires: java-1.6.0-openjdk-devel
 %endif
 # Mauve build requirements.
 BuildRequires: xorg-x11-server-Xvfb
@@ -229,7 +229,11 @@
 # Postun requires alternatives to uninstall tool alternatives.
 Requires(postun): %{_sbindir}/alternatives
 
-#i Standard JPackage devel provides.
+# 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
+
+# Standard JPackage devel provides.
 Provides: java-sdk-%{javaver}-%{origin} = %{epoch}:%{version}
 Provides: java-sdk-%{javaver} = %{epoch}:%{version}
 Provides: java-sdk-%{origin} = %{epoch}:%{version}
@@ -247,6 +251,10 @@
 
 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
+
 %description demo
 The OpenJDK demos.
 
@@ -256,6 +264,10 @@
 
 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
+
 %description src
 The OpenJDK source bundle.
 
@@ -268,6 +280,10 @@
 # Postun requires alternatives to uninstall javadoc alternative.
 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
+
 # Standard JPackage javadoc provides.
 Provides: java-javadoc = %{epoch}:%{version}-%{release}
 Provides: java-%{javaver}-javadoc = %{epoch}:%{version}-%{release}
@@ -286,6 +302,10 @@
 # Postun requires alternatives to uninstall plugin alternative.
 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
+
 # Standard JPackage plugin provides.
 Provides: java-plugin = %{javaver}
 Provides: java-%{javaver}-plugin = %{epoch}:%{version}
@@ -667,6 +687,8 @@
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 %doc %{buildoutputdir}/j2sdk-image/jre/README.html
 %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README
+# FIXME: The TRADEMARK file should be in j2sdk-image.
+%doc openjdk/TRADEMARK
 %doc AUTHORS
 %doc COPYING
 %doc ChangeLog
@@ -701,6 +723,8 @@
 %doc %{buildoutputdir}/j2sdk-image/LICENSE
 %doc %{buildoutputdir}/j2sdk-image/README.html
 %doc %{buildoutputdir}/j2sdk-image/THIRD_PARTY_README
+# FIXME: The TRADEMARK file should be in j2sdk-image.
+%doc openjdk/TRADEMARK
 %dir %{_jvmdir}/%{sdkdir}/bin
 %dir %{_jvmdir}/%{sdkdir}/include
 %dir %{_jvmdir}/%{sdkdir}/lib
@@ -759,6 +783,13 @@
 
 %changelog
 * Tue Mar 11 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.2.b06
+- Added Provides and Obsoletes for all subpackages. All sub-packages 
+replaces java-1.7.0-icedtea.
+- Updated Release.
+- Changed BuildRequires from java-1.7.0-icedtea to java-1.6.0-openjdk.
+- Added TRADEMARK file to docs.
+
+* 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