1. photon
  2. Commit 4f7a83d2ffb875d1b920f9e35545f620ec75b6d1
Browse code

Removed installing openjdk9 with openjdk10

Removed installing openjdk9 with openjdk10 and also removed making openjdk obsolete.

Change-Id: I5432ba3f0aa863bc69869f68d1c72c16a6142149
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5434
Reviewed-by: Sharath George
Tested-by: Sharath George

Tapas Kundu authored on 2018/08/01 00:02:00
Showing 2 changed files
SPECS/openjdk10/openjdk10.spec
History View file @ 4f7a83d
... ... 
@@ -3,7 +3,7 @@
3 3 
 Summary:	OpenJDK
4 4 
 Name:		openjdk10
5 5 
 Version:	1.10.0.23
6 
-Release:	1%{?dist}
6 
+Release:	2%{?dist}
7 7 
 License:	GNU GPL
8 8 
 URL:		https://openjdk.java.net
9 9 
 Group:		Development/Tools
... ... 
@@ -21,11 +21,6 @@ BuildRequires:	chkconfig
21 21 
 BuildRequires:  fontconfig-devel freetype2-devel glib-devel harfbuzz-devel elfutils-libelf-devel
22 22 
 Requires:       openjre10 = %{version}-%{release}
23 23 
 Requires:       chkconfig
24 
-Requires:       openjdk9
25 
-Obsoletes:      openjdk <= %{version}
26 
-Obsoletes:      openjdk-sample <= %{version}
27 
-Obsoletes:      openjdk-src <= %{version}
28 
-Obsoletes:      openjdk-doc <= %{version}
29 24 
 AutoReqProv: 	no
30 25 
 %define bootstrapjdkversion 1.8.0.112
31 26 
 %define jdk_major_version 1.10.0
... ... 
@@ -35,7 +30,6 @@ The OpenJDK package installs java class library and javac java compiler.
35 35 
 %package	-n openjre10
36 36 
 Summary:	Java runtime environment
37 37 
 AutoReqProv: 	no
38 
-Obsoletes:      openjre <= %{version}
39 38 
 Requires:       chkconfig
40 39 
 Requires:	libstdc++
41 40 
 %description	-n openjre10
... ... 
@@ -44,7 +38,6 @@ It contains the libraries files for Java runtime environment
44 44 
 %package		doc
45 45 
 Summary:		Documentation and demo applications for openjdk
46 46 
 Group:          Development/Languages/Java
47 
-Obsoletes:      openjdk-doc <= %{version}
48 47 
 Requires:       %{name} = %{version}-%{release}
49 48 
 %description	doc
50 49 
 It contains the documentation and demo applications for openjdk
... ... 
@@ -52,7 +45,6 @@ It contains the documentation and demo applications for openjdk
52 52 
 %package 		src
53 53 
 Summary:        OpenJDK Java classes for developers
54 54 
 Group:          Development/Languages/Java
55 
-Obsoletes:      openjdk-src <= %{version}
56 55 
 Requires:       %{name} = %{version}-%{release}
57 56 
 %description	src
58 57 
 This package provides the runtime library class sources.
... ... 
@@ -224,5 +216,7 @@ rm -rf %{_libdir}/jvm/OpenJDK-*
224 224 
 %{_libdir}/jvm/OpenJDK-%{version}/lib/src.zip
225 225
226 226 
 %changelog
227 
+*   Tue Jul 31 2018 Tapas Kundu <tkundu@vmware.com> 1.10.0.23-2
228 
+-   Removed installing openjdk9 with openjdk10 and removed obsolete for openjdk.
227 229 
 *   Mon Jul 16 2018 Tapas Kundu <tkundu@vmware.com> 1.10.0.23-1
228 230 
 -   Initial build. First version
SPECS/openjdk9/openjdk9.spec
History View file @ 4f7a83d
... ... 
@@ -3,7 +3,7 @@
3 3 
 Summary:	OpenJDK
4 4 
 Name:		openjdk9
5 5 
 Version:	1.9.0.181
6 
-Release:	1%{?dist}
6 
+Release:	2%{?dist}
7 7 
 License:	GNU GPL
8 8 
 URL:		https://openjdk.java.net
9 9 
 Group:		Development/Tools
... ... 
@@ -22,10 +22,6 @@ BuildRequires:  elfutils-libelf-devel
22 22 
 BuildRequires:  fontconfig-devel freetype2-devel glib-devel harfbuzz-devel
23 23 
 Requires:       openjre9 = %{version}-%{release}
24 24 
 Requires:       chkconfig
25 
-Obsoletes:      openjdk <= %{version}
26 
-Obsoletes:      openjdk-sample <= %{version}
27 
-Obsoletes:      openjdk-src <= %{version}
28 
-Obsoletes:      openjdk-doc <= %{version}
29 25 
 AutoReqProv: 	no
30 26 
 %define bootstrapjdkversion 1.8.0.112
31 27 
 %define jdk_major_version 1.9.0
... ... 
@@ -35,7 +31,6 @@ The OpenJDK package installs java class library and javac java compiler.
35 35 
 %package	-n openjre9
36 36 
 Summary:	Java runtime environment
37 37 
 AutoReqProv: 	no
38 
-Obsoletes:      openjre <= %{version}
39 38 
 Requires:       chkconfig
40 39 
 Requires:	libstdc++
41 40 
 %description	-n openjre9
... ... 
@@ -44,7 +39,6 @@ It contains the libraries files for Java runtime environment
44 44 
 %package		doc
45 45 
 Summary:		Documentation and demo applications for openjdk
46 46 
 Group:          Development/Languages/Java
47 
-Obsoletes:      openjdk-doc <= %{version}
48 47 
 Requires:       %{name} = %{version}-%{release}
49 48 
 %description	doc
50 49 
 It contains the documentation and demo applications for openjdk
... ... 
@@ -52,7 +46,6 @@ It contains the documentation and demo applications for openjdk
52 52 
 %package 		src
53 53 
 Summary:        OpenJDK Java classes for developers
54 54 
 Group:          Development/Languages/Java
55 
-Obsoletes:      openjdk-src <= %{version}
56 55 
 Requires:       %{name} = %{version}-%{release}
57 56 
 %description	src
58 57 
 This package provides the runtime library class sources.
... ... 
@@ -228,5 +221,7 @@ rm -rf %{_libdir}/jvm/OpenJDK-*
228 228 
 %{_libdir}/jvm/OpenJDK-%{version}/lib/src.zip
229 229
230 230 
 %changelog
231 
+*   Wed Aug 1 2018 Tapas Kundu <tkundu@vmware.com> 1.9.0.181-2
232 
+-   Removed the obsolete for openjdk.
231 233 
 *   Fri Jul 20 2018 Tapas Kundu <tkundu@vmware.com> 1.9.0.181-1
232 234 
 -   Initial build. First version