From 606ae168f2303dbdfeff5ae424ca1867338cf5cb37f66118c6faf9e0d5ff7e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 9 Jun 2017 10:13:45 +0000
Subject: [PATCH] - Version update to 3.21.0:   * various compiler settings   *
 Require java >= 1.6

OBS-URL: https://build.opensuse.org/package/show/Java:packages/javassist?expand=0&rev=15
---
 javassist.changes    |  7 +++++++
 javassist.spec       | 26 +++++++-------------------
 rel_3_19_0_ga.tar.gz |  3 ---
 rel_3_21_0_ga.tar.gz |  3 +++
 4 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 rel_3_19_0_ga.tar.gz
 create mode 100644 rel_3_21_0_ga.tar.gz

diff --git a/javassist.changes b/javassist.changes
index 9775d45..6c05290 100644
--- a/javassist.changes
+++ b/javassist.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun  9 10:14:10 UTC 2017 - tchvatal@suse.com
+
+- Version update to 3.21.0:
+  * various compiler settings
+  * Require java >= 1.6
+
 -------------------------------------------------------------------
 Sat Jan 24 16:40:33 UTC 2015 - p.drouand@gmail.com
 
diff --git a/javassist.spec b/javassist.spec
index 3dea0bc..cd71bef 100644
--- a/javassist.spec
+++ b/javassist.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package javassist
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2005, JPackage Project
 # All rights reserved.
 #
@@ -18,19 +18,18 @@
 #
 
 
-
 Summary:        Java Programming Assistant: bytecode manipulation
 License:        LGPL-2.1+ or MPL-1.1
 Group:          Development/Libraries/Java
 Name:           javassist
-%define tar_version rel_3_19_0_ga
-Version:        3.19.0
+%define tar_version rel_3_21_0_ga
+Version:        3.21.0
 Release:        0
 Url:            http://www.csg.ci.i.u-tokyo.ac.jp/~chiba/javassist/
 Source0:        https://github.com/jboss-javassist/javassist/archive/%{tar_version}.tar.gz
 BuildRequires:  ant >= 1.6
+BuildRequires:  java-devel >= 1.6
 BuildRequires:  javapackages-tools
-BuildRequires:  java-devel
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -96,24 +95,14 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 cp -pr sample/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # manual
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/tutorial
 cp -pr tutorial/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/tutorial
 cp -p License.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}
-fi
-
 %files
 %defattr(0644,root,root,0755)
 %dir %{_docdir}/%{name}-%{version}
@@ -126,8 +115,7 @@ fi
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
diff --git a/rel_3_19_0_ga.tar.gz b/rel_3_19_0_ga.tar.gz
deleted file mode 100644
index 9d4de05..0000000
--- a/rel_3_19_0_ga.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:69d07b5d05e15a159d4f281ffc5f9b1aada49eed3a34bcd70b4a9450ca9dae40
-size 1217998
diff --git a/rel_3_21_0_ga.tar.gz b/rel_3_21_0_ga.tar.gz
new file mode 100644
index 0000000..98eb164
--- /dev/null
+++ b/rel_3_21_0_ga.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae3a3668fc9ac33ec15b871ce219df31e37c6614503067b033feb8a547669782
+size 1208816