Version 8.0.1.

- Add 0002-Catch-CompileException-in-test.patch to fix compilation of a test
- Make generate-tarball.sh actually compress the tarball
This commit is contained in:
Jerry James 2020-08-14 21:45:55 -06:00
parent d2817ad3f5
commit c3f14c836b
5 changed files with 39 additions and 13 deletions

6
.gitignore vendored
View File

@ -25,3 +25,9 @@
/asm-test-7.0.pom /asm-test-7.0.pom
/asm-tree-7.0.pom /asm-tree-7.0.pom
/asm-util-7.0.pom /asm-util-7.0.pom
/asm-8.0.1.pom
/asm-analysis-8.0.1.pom
/asm-commons-8.0.1.pom
/asm-test-8.0.1.pom
/asm-tree-8.0.1.pom
/asm-util-8.0.1.pom

View File

@ -0,0 +1,12 @@
--- a/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java
+++ b/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java
@@ -107,8 +107,8 @@ public class ASMifierTest extends AsmTes
}
private static byte[] compile(final String name, final String source) throws IOException {
- Parser parser = new Parser(new Scanner(name, new StringReader(source)));
try {
+ Parser parser = new Parser(new Scanner(name, new StringReader(source)));
UnitCompiler unitCompiler = new UnitCompiler(parser.parseCompilationUnit(), ICLASS_LOADER);
return unitCompiler.compileUnit(true, true, true)[0].toByteArray();
} catch (CompileException e) {

View File

@ -23,6 +23,6 @@ find -name '*.jar' -delete
find */asm{,-analysis,-commons} -name '*.class' -delete find */asm{,-analysis,-commons} -name '*.class' -delete
rm -r */gradle rm -r */gradle
tar cf "../${name}-${version}.tar.gz" * tar cf "../${name}-${version}.tar.gz" -I 'gzip -9' *
cd .. cd ..
rm -r tarball-tmp "${name}-${version}.orig.tar.gz" rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

View File

@ -2,8 +2,8 @@
%bcond_without osgi %bcond_without osgi
Name: objectweb-asm Name: objectweb-asm
Version: 7.3.1 Version: 8.0.1
Release: 4%{?dist} Release: 1%{?dist}
Summary: Java bytecode manipulation and analysis framework Summary: Java bytecode manipulation and analysis framework
License: BSD License: BSD
URL: http://asm.ow2.org/ URL: http://asm.ow2.org/
@ -28,6 +28,11 @@ Source9: generate-tarball.sh
# To restore some deprecations that were deleted and broke the API # To restore some deprecations that were deleted and broke the API
Patch0: 0001-Revert-upstream-change-2a58bc9.patch Patch0: 0001-Revert-upstream-change-2a58bc9.patch
# Move a statement that can throw a CompileException inside a try-catch block
# for that exception. Upstream has fixed this another way with a large code
# refactor that seems inappropriate to backport.
Patch1: 0002-Catch-CompileException-in-test.patch
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
@ -65,9 +70,7 @@ Summary: API documentation for %{name}
This package provides %{summary}. This package provides %{summary}.
%prep %prep
%setup -q %autosetup -p1
%patch0 -p1
# A custom parent pom to aggregate the build # A custom parent pom to aggregate the build
cp -p %{SOURCE1} pom.xml cp -p %{SOURCE1} pom.xml
@ -156,6 +159,11 @@ popd
%license LICENSE.txt %license LICENSE.txt
%changelog %changelog
* Fri Aug 14 2020 Jerry James <loganjerry@gmail.com> - 8.0.1-1
- Version 8.0.1
- Add 0002-Catch-CompileException-in-test.patch to fix compilation of a test
- Make generate-tarball.sh actually compress the tarball
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-4 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

14
sources
View File

@ -1,7 +1,7 @@
SHA512 (objectweb-asm-7.3.1.tar.gz) = 8b7523a7a56d1bf802c6bc476e8fbd23911952143c619cfce9b976e66aa6b5dbce5eda4567060c020ab098821942acd9c0539e00ba0c445548da9b67ff932cd4 SHA512 (objectweb-asm-8.0.1.tar.gz) = 9ab01a55a2cc855bb2bd113a6923c62a0bdeb9311a5061508cf76e6bf1d96c37a9ff6d7af90c52eaf1cec102142c3dd7b6fa6fc0392ef2a96e687c639593f375
SHA512 (asm-7.3.1.pom) = bc1effc5b1e386fb352d4839b91e395997ae3053b165f93460d3b7f6ca1445e08a242287d30a7a9514161b0656f090dc7cd65e858a506d7b0ed750af7b316b42 SHA512 (asm-8.0.1.pom) = d2600348bd58f5f1a00a0dee7130088e7552be251c915922816952fc613377bd167762d3b986b67448ada28a84d8af668e8914ffcee4a446e0355e80bc7cbae8
SHA512 (asm-analysis-7.3.1.pom) = 616bb5f12fe450d816c3b785b9942050bf9f5feadeafc123d28bf1a8d3dba64876a5f43024543ac91078f353f6a9429950635cca4ef0304e3d64b3d99014c65d SHA512 (asm-analysis-8.0.1.pom) = 60b8806ad63a31a13f523f5b3410b2553292faebdc8fbc27c6d7d6237c17744a98ce5c7ac3a3defdbfe57400f914d66bfb4f3124b57c207fc6ebb4d559245550
SHA512 (asm-commons-7.3.1.pom) = eb54866a53fade6e8c1f93507b6b3d8a234fe8a9ef8fa84dccc583612f1b1c8cb99e8ec3f547d20191b6dbc6627e53d5a0989a9ee87662af2c088cf20585e4c9 SHA512 (asm-commons-8.0.1.pom) = 1889eabf9f5758cf3b4a2cb8d1c6585d71be6fc9d3efbd53ef6f379ad422167398f9d1b393abdb8ffdc5420ab47f8d842fe112b8542a3d5245a80212c7219cb0
SHA512 (asm-test-7.3.1.pom) = 17aabc1e94ff7320f2e5c8c3a47c107388ce456002f93737955bd448178d3a261cd5831e7c6b5b77bb7383b34793e9c879329dceff16b9ae63b686c17f38117e SHA512 (asm-test-8.0.1.pom) = fd796c236b9b19facf828337e276d8933e1d08776dec96f8a370637b9706054eb8a9653b4c44fcecee5522ec2a24f9517a31a9858137adee5517b2824ebc1870
SHA512 (asm-tree-7.3.1.pom) = 9fd3cb4898e0196cd912d8aaeceaed04a1e3b02701d4c3f761c8d899b1dbe09824d58b0dfda53ec6bebd109d10e6783a1ee3454bcd604a03dea0f871ff108523 SHA512 (asm-tree-8.0.1.pom) = 0116575ff309fee303ebe9c226c55993958aa0f84426aeb8fceb08c1f5a618f516114e556320e3d4a75e4b4fe575b05e9d774a988efb3609ebf92c0be0fd8b84
SHA512 (asm-util-7.3.1.pom) = 576462d670520bfb09159d69bd66cd152ba71c14c74670ad4ffe44e09146f935837056a3122a594a54792ab0e8dd873f72653c3d2853810e48ef2680453431ce SHA512 (asm-util-8.0.1.pom) = 66bde49a77c2ab636e0f6499b71a636a45d01cfd7d82da0d1c8377cee126b9194559f12de0ab4b10236553b761b24d8f645103ec051bd39dc1f6db50453ffd8f