diff --git a/javassist-rel_3_21_0_ga-javadoc.patch b/javassist-rel_3_21_0_ga-javadoc.patch deleted file mode 100644 index 0ef09e5..0000000 --- a/javassist-rel_3_21_0_ga-javadoc.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- javassist-rel_3_21_0_ga/src/main/javassist/bytecode/analysis/package.html 2016-10-03 17:44:29.000000000 +0200 -+++ javassist-rel_3_21_0_ga/src/main/javassist/bytecode/analysis/package.html 2017-09-08 10:13:36.599899677 +0200 -@@ -11,10 +11,10 @@ -

The users of this package must know the specifications of - class file and Java bytecode. For more details, read this book: - --

- - - ---- javassist-rel_3_21_0_ga/src/main/javassist/bytecode/package.html 2016-10-03 17:44:29.000000000 +0200 -+++ javassist-rel_3_21_0_ga/src/main/javassist/bytecode/package.html 2017-09-08 10:12:48.055898848 +0200 -@@ -9,10 +9,10 @@ -

The users of this package must know the specifications of - class file and Java bytecode. For more details, read this book: - --

- - - ---- javassist-rel_3_21_0_ga/src/main/javassist/package.html 2016-10-03 17:44:29.000000000 +0200 -+++ javassist-rel_3_21_0_ga/src/main/javassist/package.html 2017-09-08 10:14:14.935900331 +0200 -@@ -12,9 +12,9 @@ - -

To know the version number of this package, type the following command: - --

- -

It prints the version number on the console. - diff --git a/javassist.changes b/javassist.changes index ca75fac..126e1f3 100644 --- a/javassist.changes +++ b/javassist.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sun Oct 7 16:51:45 UTC 2018 - Jan Engelhardt + +- Replace old $RPM_* shell vars by macros. + +------------------------------------------------------------------- +Fri Oct 5 13:19:12 UTC 2018 - pmonrealgonzalez@suse.com + +- Version update to 3.23.1: + * 3.23.1 Github PR #171 + * 3.23 Fix leaking file handlers in ClassPool and removed + ClassPath.close(). Github issue #165 + * 3.22 Java 9 supports. + JIRA JASSIST-261. +- Dropped patch fixed upstream: + javassist-rel_3_21_0_ga-javadoc.patch + ------------------------------------------------------------------- Fri Sep 8 08:16:21 UTC 2017 - fstrba@suse.com diff --git a/javassist.spec b/javassist.spec index 44ed99b..c3745ed 100644 --- a/javassist.spec +++ b/javassist.spec @@ -1,7 +1,7 @@ # # spec file for package javassist # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2005, JPackage Project # All rights reserved. # @@ -14,21 +14,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define tar_version rel_3_23_1_ga Summary: Java Programming Assistant: bytecode manipulation -License: LGPL-2.1+ or MPL-1.1 +License: LGPL-2.1-or-later OR MPL-1.1 Group: Development/Libraries/Java Name: javassist -%define tar_version rel_3_21_0_ga -Version: 3.21.0 +Version: 3.23.1 Release: 0 -Url: http://www.csg.ci.i.u-tokyo.ac.jp/~chiba/javassist/ +Url: https://www.javassist.org/ Source0: https://github.com/jboss-javassist/javassist/archive/%{tar_version}.tar.gz -Patch0: javassist-rel_3_21_0_ga-javadoc.patch BuildRequires: ant >= 1.6 +BuildRequires: fdupes BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-tools BuildArch: noarch @@ -77,7 +77,6 @@ Tutorial for javassist. %prep %setup -q -n %{name}-%{tar_version} -%patch0 -p1 for j in $(find . -name "*.jar"); do mv $j $j.no done @@ -87,23 +86,25 @@ ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 dist %install # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} +mkdir -p %{buildroot}/%{_javadir} cp -p %{name}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}/%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}/%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # demo -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} -cp -pr sample/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} +mkdir -p %{buildroot}/%{_datadir}/%{name}-%{version} +cp -pr sample/* %{buildroot}/%{_datadir}/%{name}-%{version} # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}/%{_javadocdir}/%{name} +cp -pr html/* %{buildroot}/%{_javadocdir}/%{name} + +%fdupes -s %{buildroot}/%{_javadocdir}/%{name}/jquery/ # 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} +mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}/tutorial +cp -pr tutorial/* %{buildroot}/%{_docdir}/%{name}-%{version}/tutorial +cp -p License.html %{buildroot}/%{_docdir}/%{name}-%{version} %files %defattr(0644,root,root,0755) diff --git a/rel_3_21_0_ga.tar.gz b/rel_3_21_0_ga.tar.gz deleted file mode 100644 index 98eb164..0000000 --- a/rel_3_21_0_ga.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae3a3668fc9ac33ec15b871ce219df31e37c6614503067b033feb8a547669782 -size 1208816 diff --git a/rel_3_23_1_ga.tar.gz b/rel_3_23_1_ga.tar.gz new file mode 100644 index 0000000..63f5a1f --- /dev/null +++ b/rel_3_23_1_ga.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:feb2630414c4b66c500b2f75867519bbaa68d303bc9db12fbddcca2717db0ada +size 1263745