Change-Id: I954c0534077380dc86cf172a6e585b4e46b8fb05
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3126
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Priyesh Padmavilasom <ppadmavilasom@vmware.com>
... | ... |
@@ -3,7 +3,7 @@ |
3 | 3 |
Summary: OpenJDK |
4 | 4 |
Name: openjdk8 |
5 | 5 |
Version: 1.8.0.131 |
6 |
-Release: 2%{?dist} |
|
6 |
+Release: 3%{?dist} |
|
7 | 7 |
License: GNU GPL |
8 | 8 |
URL: https://openjdk.java.net |
9 | 9 |
Group: Development/Tools |
... | ... |
@@ -24,6 +24,7 @@ BuildRequires: ca-certificates |
24 | 24 |
BuildRequires: chkconfig |
25 | 25 |
Requires: openjre8 = %{version}-%{release} |
26 | 26 |
Requires: chkconfig |
27 |
+Obsoletes: openjdk <= %{version} |
|
27 | 28 |
AutoReqProv: no |
28 | 29 |
%define bootstrapjdkversion 1.8.0.112 |
29 | 30 |
%description |
... | ... |
@@ -32,6 +33,7 @@ The OpenJDK package installs java class library and javac java compiler. |
32 | 32 |
%package -n openjre8 |
33 | 33 |
Summary: Java runtime environment |
34 | 34 |
AutoReqProv: no |
35 |
+Obsoletes: openjre <= %{version} |
|
35 | 36 |
Requires: chkconfig |
36 | 37 |
Requires: libstdc++ |
37 | 38 |
%description -n openjre8 |
... | ... |
@@ -41,6 +43,7 @@ It contains the libraries files for Java runtime environment |
41 | 41 |
%package sample |
42 | 42 |
Summary: Sample java applications. |
43 | 43 |
Group: Development/Languages/Java |
44 |
+Obsoletes: openjdk-sample <= %{version} |
|
44 | 45 |
Requires: %{name} = %{version}-%{release} |
45 | 46 |
%description sample |
46 | 47 |
It contains the Sample java applications. |
... | ... |
@@ -48,6 +51,7 @@ It contains the Sample java applications. |
48 | 48 |
%package doc |
49 | 49 |
Summary: Documentation and demo applications for openjdk |
50 | 50 |
Group: Development/Languages/Java |
51 |
+Obsoletes: openjdk-doc <= %{version} |
|
51 | 52 |
Requires: %{name} = %{version}-%{release} |
52 | 53 |
%description doc |
53 | 54 |
It contains the documentation and demo applications for openjdk |
... | ... |
@@ -55,6 +59,7 @@ It contains the documentation and demo applications for openjdk |
55 | 55 |
%package src |
56 | 56 |
Summary: OpenJDK Java classes for developers |
57 | 57 |
Group: Development/Languages/Java |
58 |
+Obsoletes: openjdk-src <= %{version} |
|
58 | 59 |
Requires: %{name} = %{version}-%{release} |
59 | 60 |
%description src |
60 | 61 |
This package provides the runtime library class sources. |
... | ... |
@@ -227,6 +232,8 @@ rm -rf %{buildroot}/* |
227 | 227 |
%{_libdir}/jvm/OpenJDK-%{version}/src.zip |
228 | 228 |
|
229 | 229 |
%changelog |
230 |
+* Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com> 1.8.0.131-3 |
|
231 |
+- Added obseletes for deprecated openjdk package |
|
230 | 232 |
* Tue Jun 06 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.131-2 |
231 | 233 |
- Add requires for libstdc++ |
232 | 234 |
* Mon Apr 10 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.131-1 |
... | ... |
@@ -2,7 +2,7 @@ |
2 | 2 |
Summary: A portable, high level programming interface to various calling conventions |
3 | 3 |
Name: sqlite |
4 | 4 |
Version: 3.18.0 |
5 |
-Release: 1%{?dist} |
|
5 |
+Release: 2%{?dist} |
|
6 | 6 |
License: Public Domain |
7 | 7 |
URL: http://www.sqlite.org |
8 | 8 |
Group: System Environment/GeneralLibraries |
... | ... |
@@ -31,6 +31,7 @@ Summary: sqlite3 library |
31 | 31 |
Group: Libraries |
32 | 32 |
Provides: pkgconfig(sqlite3) |
33 | 33 |
Obsoletes: libsqlite |
34 |
+Obsoletes: sqlite-autoconf |
|
34 | 35 |
%description libs |
35 | 36 |
The sqlite3 library. |
36 | 37 |
|
... | ... |
@@ -85,6 +86,8 @@ rm -rf %{buildroot}/* |
85 | 85 |
%{_libdir}/libsqlite3.so.0.8.6 |
86 | 86 |
|
87 | 87 |
%changelog |
88 |
+* Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com> 3.18.0-2 |
|
89 |
+- Added obseletes for deprecated sqlite-autoconf package |
|
88 | 90 |
* Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 3.18.0-1 |
89 | 91 |
- Version update |
90 | 92 |
- Package rename: sqlite-autoconf -> sqlite |