Hello community, here is the log from the commit of package javassist for openSUSE:Leap:15.2 checked in at 2020-02-05 07:24:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/javassist (Old) and /work/SRC/openSUSE:Leap:15.2/.javassist.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javassist" Wed Feb 5 07:24:41 2020 rev:17 rq:762838 version:3.23.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/javassist/javassist.changes 2020-01-15 15:13:16.978169975 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.javassist.new.26092/javassist.changes 2020-02-05 07:24:42.194627552 +0100 @@ -1,0 +2,35 @@ +Mon Apr 15 08:57:00 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Added patch: + * javassist-java8-compat.patch + - Allow building on systems that do not have java 9 or higher + +------------------------------------------------------------------- +Thu Oct 18 11:32:34 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Install and package the maven pom and metadata files + +------------------------------------------------------------------- +Mon Oct 15 14:53:58 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- BuildRequire at least Java 9. This version uses APIs introduced + in Java 9 + +------------------------------------------------------------------- +Sun Oct 7 16:51:45 UTC 2018 - Jan Engelhardt <jeng...@inai.de> + +- Replace old $RPM_* shell vars by macros. + +------------------------------------------------------------------- +Fri Oct 5 13:19:12 UTC 2018 - pmonrealgonza...@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 + +------------------------------------------------------------------- Old: ---- javassist-rel_3_21_0_ga-javadoc.patch rel_3_21_0_ga.tar.gz New: ---- javassist-java8-compat.patch rel_3_23_1_ga.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javassist.spec ++++++ --- /var/tmp/diff_new_pack.7QHDnt/_old 2020-02-05 07:24:43.530628115 +0100 +++ /var/tmp/diff_new_pack.7QHDnt/_new 2020-02-05 07:24:43.566628130 +0100 @@ -1,9 +1,8 @@ # # spec file for package javassist # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2005, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,25 +13,24 @@ # 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/ # -Summary: Java Programming Assistant: bytecode manipulation -License: LGPL-2.1+ or MPL-1.1 -Group: Development/Libraries/Java +%define tar_version rel_3_23_1_ga 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/ +Summary: Java Programming Assistant: bytecode manipulation +License: LGPL-2.1-or-later OR MPL-1.1 +Group: Development/Libraries/Java +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 +Patch0: javassist-java8-compat.patch BuildRequires: ant >= 1.6 -BuildRequires: java-devel >= 1.6 -BuildRequires: javapackages-tools +BuildRequires: fdupes +BuildRequires: javapackages-local BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Javassist (Java Programming Assistant) makes Java bytecode manipulation @@ -77,7 +75,9 @@ %prep %setup -q -n %{name}-%{tar_version} +%if %{?pkg_vcmp:%pkg_vcmp java-devel < 9}%{!?pkg_vcmp:1} %patch0 -p1 +%endif for j in $(find . -name "*.jar"); do mv $j $j.no done @@ -87,29 +87,42 @@ %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) + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar -a javassist:javassist # 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) %dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/License.html +%license %{_docdir}/%{name}-%{version}/License.html %{_javadir}/*.jar +%{_mavenpomdir}/* +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml* +%endif %files demo %defattr(0644,root,root,0755) ++++++ javassist-java8-compat.patch ++++++ diff -urEbwB javassist-rel_3_23_1_ga/src/main/javassist/Loader.java javassist-rel_3_23_1_ga.new/src/main/javassist/Loader.java --- javassist-rel_3_23_1_ga/src/main/javassist/Loader.java 2018-07-01 19:27:13.000000000 +0200 +++ javassist-rel_3_23_1_ga.new/src/main/javassist/Loader.java 2019-04-15 10:53:53.377698340 +0200 @@ -379,9 +379,6 @@ } private boolean isDefinedPackage(String name) { - if (ClassFile.MAJOR_VERSION >= ClassFile.JAVA_9) - return getDefinedPackage(name) == null; - else return getPackage(name) == null; } diff -urEbwB javassist-rel_3_23_1_ga/src/main/javassist/util/proxy/DefineClassHelper.java javassist-rel_3_23_1_ga.new/src/main/javassist/util/proxy/DefineClassHelper.java --- javassist-rel_3_23_1_ga/src/main/javassist/util/proxy/DefineClassHelper.java 2018-07-01 19:27:13.000000000 +0200 +++ javassist-rel_3_23_1_ga.new/src/main/javassist/util/proxy/DefineClassHelper.java 2019-04-15 10:53:53.381698361 +0200 @@ -253,23 +253,5 @@ } } - /** - * Loads a class file by {@code java.lang.invoke.MethodHandles.Lookup}. - * - * @since 3.22 - */ - static Class<?> toPublicClass(String className, byte[] bcode) - throws CannotCompileException - { - try { - Lookup lookup = MethodHandles.lookup(); - lookup = lookup.dropLookupMode(java.lang.invoke.MethodHandles.Lookup.PRIVATE); - return lookup.defineClass(bcode); - } - catch (Throwable t) { - throw new CannotCompileException(t); - } - } - private DefineClassHelper() {} } diff -urEbwB javassist-rel_3_23_1_ga/src/main/javassist/util/proxy/FactoryHelper.java javassist-rel_3_23_1_ga.new/src/main/javassist/util/proxy/FactoryHelper.java --- javassist-rel_3_23_1_ga/src/main/javassist/util/proxy/FactoryHelper.java 2018-07-01 19:27:13.000000000 +0200 +++ javassist-rel_3_23_1_ga.new/src/main/javassist/util/proxy/FactoryHelper.java 2019-04-15 10:56:19.942478868 +0200 @@ -123,8 +123,6 @@ { try { byte[] b = toBytecode(cf); - if (ProxyFactory.onlyPublicMethods) - return DefineClassHelper.toPublicClass(cf.getName(), b); return DefineClassHelper.toClass(cf.getName(), loader, domain, b); } catch (IOException e) { ++++++ rel_3_21_0_ga.tar.gz -> rel_3_23_1_ga.tar.gz ++++++ ++++ 25128 lines of diff (skipped)
