From 590f80fc93f4f5d8b2b69d7f927fe77fc5013c6d Mon Sep 17 00:00:00 2001
From: Dinesh Prasanth M K <dmoluguw@redhat.com>
Date: Mar 25 2020 18:26:56 +0000
Subject: Rebase to 3.21.0


Note: javassist cannot be rebased beyond this version unless Fedora
updates the default jdk to >=10

Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index 0dc19d2..9892537 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ javassist-3.14.0-GA.zip
 javassist-3.15.0-GA.zip
 /javassist-3.16.1-GA.zip
 /rel_3_18_1_ga.tar.gz
+/rel_3_21_0_ga.tar.gz
diff --git a/javassist-buildfile-nosource1.4-nosrcjar.patch b/javassist-buildfile-nosource1.4-nosrcjar.patch
deleted file mode 100644
index b8b467d..0000000
--- a/javassist-buildfile-nosource1.4-nosrcjar.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- build.xml.old	2008-10-09 19:51:16.000000000 +0200
-+++ build.xml	2008-12-09 16:27:29.000000000 +0100
-@@ -155,17 +155,19 @@
- to ${build.classes.dir}.</echo>
-   </target>
- 
--  <target name="jar" depends="compile14">
-+  <target name="jar" depends="compile">
-     <jar jarfile="${target.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">
-       <fileset dir="${build.classes.dir}">
-       	  <include name="**/*.class"/>
-       </fileset>
-      </jar>
-+    <!--
-     <jar jarfile="${target-src.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">
-       <fileset dir="${src.dir}">
-         <include name="javassist/**"/>
-       </fileset>
-     </jar>
-+    -->
-   </target>
- 
-   <target name="javadocs">
diff --git a/javassist.spec b/javassist.spec
index 16467d3..3553b81 100644
--- a/javassist.spec
+++ b/javassist.spec
@@ -1,14 +1,14 @@
 %global upstream_version rel_%(sed s/\\\\./_/g <<<"%{version}")_ga
 
 Name:           javassist
-Version:        3.18.1
-Release:        12%{?dist}
+Version:        3.21.0
+Release:        1%{?dist}
 Summary:        The Java Programming Assistant provides simple Java bytecode manipulation
 License:        MPLv1.1 or LGPLv2+ or ASL 2.0
-URL:            http://www.csg.is.titech.ac.jp/~chiba/%{name}/
+URL:            https://www.javassist.org/
 BuildArch:      noarch
 
-Source0:        http://github.com/jboss-%{name}/%{name}/archive/%{upstream_version}.tar.gz
+Source0:        https://github.com/jboss-%{name}/%{name}/archive/%{upstream_version}.tar.gz
 
 Patch0:         0001-Remove-usage-of-junit.awtui-and-junit.swingui.patch
 
@@ -61,6 +61,9 @@ mkdir runtest
 %doc License.html
 
 %changelog
+* Wed Mar 25 2020 Dinesh Prasanth <dmoluguw@redhat.com> - 3.21.0-1
+- Rebase to 3.21.0
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 1d7ddd9..0154448 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d8a0dbf392146f6db0964dec9bf3841  rel_3_18_1_ga.tar.gz
+SHA512 (rel_3_21_0_ga.tar.gz) = 5dd855be18629306348f5a3a2d738880e6b79ac7a570ff16ddd22a5b3d23581fea1bf54b099d88c543b7045e9ff69d1e5e8fc6a323faa3dc1aa2076b164e5323