From ea9e97970cd0e59ea2b70e00c0a2f652c70ead5d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 22 2019 13:44:24 +0000
Subject: import java-1.7.0-openjdk-1.7.0.221-2.6.18.0.el7_6


---

diff --git a/.gitignore b/.gitignore
index b1986d0..d364af4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/class-rewriter.tar.gz
-SOURCES/openjdk-icedtea-2.6.17.tar.xz
+SOURCES/openjdk-icedtea-2.6.18.tar.xz
 SOURCES/pulseaudio.tar.gz
 SOURCES/systemtap-tapset-2.6.12.tar.xz
diff --git a/.java-1.7.0-openjdk.metadata b/.java-1.7.0-openjdk.metadata
index 01c6984..e01c260 100644
--- a/.java-1.7.0-openjdk.metadata
+++ b/.java-1.7.0-openjdk.metadata
@@ -1,4 +1,4 @@
 fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz
-5e36158f5a97afc1eb3a88294388795f1050c5a8 SOURCES/openjdk-icedtea-2.6.17.tar.xz
+3ab2a6aa355a6c1659048ba113d6f68ad33bfe48 SOURCES/openjdk-icedtea-2.6.18.tar.xz
 fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz
 5ea75731a73ec4766b00024c1803d1f86c0af090 SOURCES/systemtap-tapset-2.6.12.tar.xz
diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec
index f407ea1..09ec205 100644
--- a/SPECS/java-1.7.0-openjdk.spec
+++ b/SPECS/java-1.7.0-openjdk.spec
@@ -5,7 +5,7 @@
 # conflicting) files in the -debuginfo package
 %undefine _missing_build_ids_terminate_build
 
-%global icedtea_version 2.6.17
+%global icedtea_version 2.6.18
 %global icedtea_snapshot %{nil}
 %global hg_tag icedtea-%{icedtea_version}%{icedtea_snapshot}
 
@@ -160,7 +160,7 @@
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
 %global top_level_dir_name   %{origin}
-%global updatever       211
+%global updatever       221
 %global buildver        02
 # Keep priority on 7digits in case updatever>9
 %global priority        1700%{updatever}
@@ -206,7 +206,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: %{icedtea_version}%{icedtea_snapshot}.1%{?dist}
+Release: %{icedtea_version}%{icedtea_snapshot}.0%{?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
@@ -1505,6 +1505,10 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Tue Apr 16 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.7.0.221-2.6.18.0
+- Bump to 2.6.18 and OpenJDK 7u221-b02.
+- Resolves: rhbz#1693468
+
 * Wed Feb 27 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.7.0.211-2.6.17.1
 - Produce debug symbols for libpulse-java.so
 - Set IT_CFLAGS=-g so that debug symbols for the pulse audio