From 50f375a9cc29341ad5dbc87f6005e1f9e525551afed6af9b60c6d0205ac9cbb3 Mon Sep 17 00:00:00 2001 From: David Anes Date: Tue, 20 Sep 2022 16:20:45 +0000 Subject: [PATCH] Accepting request 1005007 from home:david.anes:branches:Java:packages - Version update to 3.29.2: * Include` Automatic-Module-Name in MANIFEST.MF - Rebased javassist-osgi.patch and corrected version numbers in the patch. OBS-URL: https://build.opensuse.org/request/show/1005007 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javassist?expand=0&rev=37 --- javassist-osgi.patch | 54 +++++++++++++++++++++----------------------- javassist.changes | 9 ++++++++ javassist.spec | 4 ++-- rel_3_29_1_ga.tar.gz | 3 --- rel_3_29_2_ga.tar.gz | 3 +++ 5 files changed, 40 insertions(+), 33 deletions(-) delete mode 100644 rel_3_29_1_ga.tar.gz create mode 100644 rel_3_29_2_ga.tar.gz diff --git a/javassist-osgi.patch b/javassist-osgi.patch index 900cf4d..9f0fac1 100644 --- a/javassist-osgi.patch +++ b/javassist-osgi.patch @@ -1,10 +1,8 @@ -Index: javassist-rel_3_29_1_ga/src/main/META-INF/MANIFEST.MF +Index: javassist-rel_3_29_2_ga/src/main/META-INF/MANIFEST.MF =================================================================== ---- javassist-rel_3_29_1_ga.orig/src/main/META-INF/MANIFEST.MF -+++ javassist-rel_3_29_1_ga/src/main/META-INF/MANIFEST.MF -@@ -3,3 +3,50 @@ Specification-Vendor: Shigeru Chiba, www - Specification-Version: 3.29.1-GA - Main-Class: javassist.CtClass +--- javassist-rel_3_29_2_ga.orig/src/main/META-INF/MANIFEST.MF ++++ javassist-rel_3_29_2_ga/src/main/META-INF/MANIFEST.MF +@@ -1 +1,48 @@ Automatic-Module-Name: org.javassist +Bundle-Description: Javassist (JAVA programming ASSISTant) + makes Java bytecode manipulation simple. It is a class @@ -12,44 +10,44 @@ Index: javassist-rel_3_29_1_ga/src/main/META-INF/MANIFEST.MF +Bundle-License: http://www.mozilla.org/MPL/MPL-1.1.html, + http://www.gnu.org/licenses/lgpl-2.1.html, + http://www.apache.org/licenses/ -+Bundle-ManifestVersion: 2 -+Bundle-Name: Javassist -+Bundle-SymbolicName: javassist -+Bundle-Vendor: Shigeru Chiba, www.javassist.org -+Bundle-Version: 3.29.1.GA -+Export-Package: javassist;version="3.29.1.GA"; ++Bundle-ManifestVersion: 2 ++Bundle-Name: Javassist ++Bundle-SymbolicName: javassist ++Bundle-Vendor: Shigeru Chiba, www.javassist.org ++Bundle-Version: 3.29.2.GA ++Export-Package: javassist;version="3.29.2.GA"; + uses:="javassist.bytecode,javassist.compiler, + javassist.compiler.ast,javassist.convert,javassist.expr", -+ javassist.bytecode;version="3.29.1.GA"; ++ javassist.bytecode;version="3.29.2.GA"; + uses:="javassist,javassist.bytecode.annotation", -+ javassist.bytecode.analysis;version="3.29.1.GA"; ++ javassist.bytecode.analysis;version="3.29.2.GA"; + uses:="javassist,javassist.bytecode,javassist.bytecode.stackmap", -+ javassist.bytecode.annotation;version="3.29.1.GA"; ++ javassist.bytecode.annotation;version="3.29.2.GA"; + uses:="javassist,javassist.bytecode", -+ javassist.bytecode.stackmap;version="3.29.1.GA"; ++ javassist.bytecode.stackmap;version="3.29.2.GA"; + uses:="javassist,javassist.bytecode", -+ javassist.compiler;version="3.29.1.GA"; ++ javassist.compiler;version="3.29.2.GA"; + uses:="javassist,javassist.bytecode,javassist.compiler.ast", -+ javassist.compiler.ast;version="3.29.1.GA"; ++ javassist.compiler.ast;version="3.29.2.GA"; + uses:="javassist,javassist.compiler", -+ javassist.convert;version="3.29.1.GA"; ++ javassist.convert;version="3.29.2.GA"; + uses:="javassist,javassist.bytecode", -+ javassist.expr;version="3.29.1.GA"; ++ javassist.expr;version="3.29.2.GA"; + uses:="javassist,javassist.bytecode", -+ javassist.runtime;version="3.29.1.GA", -+ javassist.scopedpool;version="3.29.1.GA"; ++ javassist.runtime;version="3.29.2.GA", ++ javassist.scopedpool;version="3.29.2.GA"; + uses:=javassist, -+ javassist.tools;version="3.29.1.GA"; ++ javassist.tools;version="3.29.2.GA"; + uses:=javassist, -+ javassist.tools.reflect;version="3.29.1.GA"; ++ javassist.tools.reflect;version="3.29.2.GA"; + uses:="javassist,javassist.bytecode", -+ javassist.tools.rmi;version="3.29.1.GA"; ++ javassist.tools.rmi;version="3.29.2.GA"; + uses:="javassist,javassist.tools.web", -+ javassist.tools.web;version="3.29.1.GA"; ++ javassist.tools.web;version="3.29.2.GA"; + uses:=javassist, -+ javassist.util;version="3.29.1.GA"; ++ javassist.util;version="3.29.2.GA"; + uses:=javassist, -+ javassist.util.proxy;version="3.29.1.GA"; ++ javassist.util.proxy;version="3.29.2.GA"; + uses:="javassist,javassist.bytecode" +Require-Capability: osgi.ee; + filter:="(&(osgi.ee=JavaSE)(version=1.7))" diff --git a/javassist.changes b/javassist.changes index dfe4ea8..c607ba1 100644 --- a/javassist.changes +++ b/javassist.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 20 16:10:40 UTC 2022 - David Anes + +- Version update to 3.29.2: + * Include` Automatic-Module-Name in MANIFEST.MF + +- Rebased javassist-osgi.patch and corrected version numbers in + the patch. + ------------------------------------------------------------------- Wed Aug 17 11:32:38 UTC 2022 - David Anes diff --git a/javassist.spec b/javassist.spec index 62e684c..75e1f53 100644 --- a/javassist.spec +++ b/javassist.spec @@ -17,9 +17,9 @@ # -%define tar_version rel_3_29_1_ga +%define tar_version rel_3_29_2_ga Name: javassist -Version: 3.29.1 +Version: 3.29.2 Release: 0 Summary: Java Programming Assistant: bytecode manipulation License: LGPL-2.1-or-later OR MPL-1.1 diff --git a/rel_3_29_1_ga.tar.gz b/rel_3_29_1_ga.tar.gz deleted file mode 100644 index e410e33..0000000 --- a/rel_3_29_1_ga.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4db21c303cc0d234e239af31cc7917e8e2cf6029ac17f9b5f083eedf2b74034 -size 1291658 diff --git a/rel_3_29_2_ga.tar.gz b/rel_3_29_2_ga.tar.gz new file mode 100644 index 0000000..f573402 --- /dev/null +++ b/rel_3_29_2_ga.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1dfafd490f9391f4e53bf5970d4453baa9da96f1932e22cbe077979330676d46 +size 1293705