diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index e9c8456..87f8cf7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,115 +3,4 @@ /.build-*.log /*.src.rpm /noarch -/objectweb-asm-*.tar.gz -/objectweb-asm-*/ -/archive.tar.gz -/asm-6.2.pom -/asm-analysis-6.2.pom -/asm-commons-6.2.pom -/asm-test-6.2.pom -/asm-tree-6.2.pom -/asm-util-6.2.pom -/asm-xml-6.2.pom -/objectweb-asm-6.2.tar.gz -/objectweb-asm-6.2.1.tar.gz -/asm-6.2.1.pom -/asm-analysis-6.2.1.pom -/asm-commons-6.2.1.pom -/asm-test-6.2.1.pom -/asm-tree-6.2.1.pom -/asm-util-6.2.1.pom -/asm-xml-6.2.1.pom -/objectweb-asm-7.0.tar.gz -/objectweb-asm-7.0/ -/asm-7.0.pom -/asm-analysis-7.0.pom -/asm-commons-7.0.pom -/asm-test-7.0.pom -/asm-tree-7.0.pom -/asm-util-7.0.pom -/objectweb-asm-7.1.tar.gz -/asm-7.1.pom -/asm-analysis-7.1.pom -/asm-commons-7.1.pom -/asm-test-7.1.pom -/asm-tree-7.1.pom -/asm-util-7.1.pom -/objectweb-asm-7.1/ -/objectweb-asm-7.2.tar.gz -/asm-7.2.pom -/asm-analysis-7.2.pom -/asm-commons-7.2.pom -/asm-test-7.2.pom -/asm-tree-7.2.pom -/asm-util-7.2.pom -/objectweb-asm-7.3.1.tar.gz -/asm-7.3.1.pom -/asm-analysis-7.3.1.pom -/asm-commons-7.3.1.pom -/asm-test-7.3.1.pom -/asm-tree-7.3.1.pom -/asm-util-7.3.1.pom -/objectweb-asm-8.0.1.tar.gz -/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 -/objectweb-asm-9.0.tar.gz -/asm-9.0.pom -/asm-analysis-9.0.pom -/asm-commons-9.0.pom -/asm-test-9.0.pom -/asm-tree-9.0.pom -/asm-util-9.0.pom -/objectweb-asm-9.1.tar.gz -/asm-9.1.pom -/asm-analysis-9.1.pom -/asm-commons-9.1.pom -/asm-test-9.1.pom -/asm-tree-9.1.pom -/asm-util-9.1.pom -/asm-9.2.pom -/asm-analysis-9.2.pom -/asm-commons-9.2.pom -/asm-test-9.2.pom -/asm-tree-9.2.pom -/asm-util-9.2.pom -/asm-9.3.pom -/asm-analysis-9.3.pom -/asm-commons-9.3.pom -/asm-test-9.3.pom -/asm-tree-9.3.pom -/asm-util-9.3.pom -/asm-9.4.pom -/asm-analysis-9.4.pom -/asm-commons-9.4.pom -/asm-test-9.4.pom -/asm-tree-9.4.pom -/asm-util-9.4.pom -/asm-9.5.pom -/asm-analysis-9.5.pom -/asm-commons-9.5.pom -/asm-test-9.5.pom -/asm-tree-9.5.pom -/asm-util-9.5.pom -/asm-9.6.pom -/asm-analysis-9.6.pom -/asm-commons-9.6.pom -/asm-test-9.6.pom -/asm-tree-9.6.pom -/asm-util-9.6.pom -/asm-9.7.pom -/asm-analysis-9.7.pom -/asm-commons-9.7.pom -/asm-test-9.7.pom -/asm-tree-9.7.pom -/asm-util-9.7.pom -/asm-9.7.1.pom -/asm-analysis-9.7.1.pom -/asm-commons-9.7.1.pom -/asm-test-9.7.1.pom -/asm-tree-9.7.1.pom -/asm-util-9.7.1.pom +/asm-* diff --git a/0001-Add-support-of-Java-25.patch b/0001-Add-support-of-Java-25.patch deleted file mode 100644 index fda2675..0000000 --- a/0001-Add-support-of-Java-25.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 756ccf40723d9ba68872252810f3dbb2b186be0c Mon Sep 17 00:00:00 2001 -From: forax -Date: Tue, 10 Dec 2024 11:11:49 +0100 -Subject: [PATCH] Add support of Java 25 - ---- - asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java | 1 + - asm/src/main/java/org/objectweb/asm/ClassReader.java | 2 +- - asm/src/main/java/org/objectweb/asm/Opcodes.java | 1 + - asm/src/test/java/org/objectweb/asm/ConstantsTest.java | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java b/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java -index 4ede9201..9ce9f1c6 100644 ---- a/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java -+++ b/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java -@@ -114,6 +114,7 @@ public class ASMifier extends Printer { - classVersions.put(Opcodes.V22, "V22"); - classVersions.put(Opcodes.V23, "V23"); - classVersions.put(Opcodes.V24, "V24"); -+ classVersions.put(Opcodes.V25, "V25"); - CLASS_VERSIONS = Collections.unmodifiableMap(classVersions); - } - -diff --git a/asm/src/main/java/org/objectweb/asm/ClassReader.java b/asm/src/main/java/org/objectweb/asm/ClassReader.java -index 33b2a300..5f66ed2b 100644 ---- a/asm/src/main/java/org/objectweb/asm/ClassReader.java -+++ b/asm/src/main/java/org/objectweb/asm/ClassReader.java -@@ -195,7 +195,7 @@ public class ClassReader { - this.b = classFileBuffer; - // Check the class' major_version. This field is after the magic and minor_version fields, which - // use 4 and 2 bytes respectively. -- if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V24) { -+ if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V25) { - throw new IllegalArgumentException( - "Unsupported class file major version " + readShort(classFileOffset + 6)); - } -diff --git a/asm/src/main/java/org/objectweb/asm/Opcodes.java b/asm/src/main/java/org/objectweb/asm/Opcodes.java -index 9aa8a3b0..4ed95869 100644 ---- a/asm/src/main/java/org/objectweb/asm/Opcodes.java -+++ b/asm/src/main/java/org/objectweb/asm/Opcodes.java -@@ -290,6 +290,7 @@ public interface Opcodes { - int V22 = 0 << 16 | 66; - int V23 = 0 << 16 | 67; - int V24 = 0 << 16 | 68; -+ int V25 = 0 << 16 | 69; - - /** - * Version flag indicating that the class is using 'preview' features. -diff --git a/asm/src/test/java/org/objectweb/asm/ConstantsTest.java b/asm/src/test/java/org/objectweb/asm/ConstantsTest.java -index e7af1d04..543ba044 100644 ---- a/asm/src/test/java/org/objectweb/asm/ConstantsTest.java -+++ b/asm/src/test/java/org/objectweb/asm/ConstantsTest.java -@@ -257,6 +257,7 @@ class ConstantsTest { - case "V22": - case "V23": - case "V24": -+ case "V25": - return ConstantType.CLASS_VERSION; - case "ACC_PUBLIC": - case "ACC_PRIVATE": --- -2.48.1 - diff --git a/aggregator.pom b/aggregator.pom deleted file mode 100644 index f267e26..0000000 --- a/aggregator.pom +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - - org.fedoraproject.xmvn.objectweb-asm - aggregator - any - pom - - - UTF-8 - - - - asm - asm-analysis - asm-commons - asm-tree - asm-util - tools/retrofitter - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - any - - - process-classes - - run - - - - - - - - - - - - - - - - - - - diff --git a/changelog b/changelog deleted file mode 100644 index 2f5cd2a..0000000 --- a/changelog +++ /dev/null @@ -1,309 +0,0 @@ -* Thu Jul 18 2024 Fedora Release Engineering - 9.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 9.6-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 9.6-4 -- bump of release for for java-21-openjdk as system jdk - -* Thu Jan 25 2024 Fedora Release Engineering - 9.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 9.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 11 2023 Marian Koncek - 9.6-1 -- Update to upstream version 9.6 - -* Fri Sep 01 2023 Mikolaj Izdebski - 9.5-3 -- Convert License tag to SPDX format - -* Thu Jul 20 2023 Fedora Release Engineering - 9.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jun 05 2023 Marian Koncek - 9.5-1 -- Update to upstream version 9.5 - -* Thu Feb 23 2023 Marian Koncek - 9.4-1 -- Update to upstream version 9.4 - -* Thu Jan 19 2023 Fedora Release Engineering - 9.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Sep 02 2022 Marian Koncek - 9.3-4 -- Fix wrong generated module infos - -* Mon Aug 29 2022 Marian Koncek - 9.3-3 -- Generate module-info without bnd-plugin -- Resolves: rhbz#2106272 - -* Fri Jul 22 2022 Fedora Release Engineering - 9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon May 09 2022 Mikolaj Izdebski - 9.3-1 -- Update to upstream version 9.3 - -* Sat Feb 05 2022 Jiri Vanek - 9.2-3 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 9.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 9.2-1 -- Update to upstream version 9.2 - -* Thu Jul 22 2021 Fedora Release Engineering - 9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 9.1-2 -- Bootstrap build -- Non-bootstrap build - -* Fri May 14 2021 Marian Koncek - 9.1-1 -- Update to upstream version 9.1 - -* Fri Feb 19 2021 Mat Booth - 9.1-1 -- Update to latest upstream release - -* Tue Jan 26 2021 Fedora Release Engineering - 8.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Sep 25 2020 Marian Koncek - 9.0-1 -- Update to upstream version 9.0 - -* Fri Aug 14 2020 Jerry James - 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 - 7.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 7.3.1-3 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Mon Jun 22 2020 Marian Koncek - 8.0.1-1 -- Update to upstream version 8.0.1 - -* Wed May 06 2020 Mat Booth - 7.3.1-2 -- Revert an upstream change to prevent breaking API change - -* Thu Feb 27 2020 Jayashree Huttanagoudat - 7.3.1-1 -- Upgraded to upstream version 7.3.1. - -* Wed Jan 29 2020 Fedora Release Engineering - 7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 21 2020 Marian Koncek - 7.3.1-1 -- Update to upstream version 7.3.1 - -* Tue Nov 05 2019 Mikolaj Izdebski - 7.2-2 -- Mass rebuild for javapackages-tools 201902 - -* Thu Oct 17 2019 Marian Koncek - 7.2-1 -- Update to upstream version 7.2 - -* Thu Jul 25 2019 Fedora Release Engineering - 7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 7.1-2 -- Mass rebuild for javapackages-tools 201901 - -* Mon May 06 2019 Severin Gehwolf - 7.1-1 -- Update to latest upstream 7.1 release. - -* Fri Feb 01 2019 Fedora Release Engineering - 7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Nov 21 2018 Severin Gehwolf - 7.0-1 -- Update to latest upstream 7.0 release. -- Removes package asm-xml (deprecated since 6.1). - -* Tue Sep 11 2018 Mat Booth - 6.2.1-1 -- Update to latest upstream release -- Fix test suite execution - -* Fri Aug 03 2018 Michael Simacek - 6.2-5 -- Repack the tarball without binaries - -* Wed Aug 01 2018 Severin Gehwolf - 6.2-4 -- Explicitly require javapackages-tools for asm-processor script - which uses java-functions. - -* Wed Aug 01 2018 Severin Gehwolf - 6.2-3 -- Allow conditionally building without OSGi - metadata. - -* Fri Jul 13 2018 Fedora Release Engineering - 6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Michael Simacek - 6.2-1 -- Update to upstream version 6.2 - -* Sat Jun 30 2018 Mikolaj Izdebski - 6.1.1-4 -- Relax versioned self-build-requirement a bit - -* Fri Jun 29 2018 Mikolaj Izdebski - 6.1.1-3 -- Add objectweb-asm to BND pluginpath - -* Thu Jun 28 2018 Mikolaj Izdebski - 6.1.1-2 -- Allow conditionally building without junit5 - -* Wed Apr 25 2018 Mat Booth - 6.1.1-1 -- Update to latest upstream relase for Java 10 support -- Switch to maven build -- Now executing test suites - -* Thu Feb 08 2018 Fedora Release Engineering - 6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 25 2017 Michael Simacek - 6.0-1 -- Update to upstream version 6.0 - -* Tue Sep 12 2017 Mikolaj Izdebski - 6.0-0.2.beta -- Fix invalid OSGi metadata -- Resolves: rhbz#1490817 - -* Mon Sep 11 2017 Mikolaj Izdebski - 6.0-0.1.beta -- Update to upstream version 6.0 beta - -* Thu Jul 27 2017 Fedora Release Engineering - 5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 5.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 10 2016 Mikolaj Izdebski - 5.1-6 -- Use OSGi API JARs to run BND classpath, instead of Eclipse - -* Sat Sep 24 2016 Mikolaj Izdebski - 5.1-5 -- Update to current packaging guidelines -- Remove obsoletes and provides for objectweb-asm4 - -* Wed Jun 15 2016 Mikolaj Izdebski - 5.1-4 -- Add missing build-requires - -* Wed Jun 1 2016 Mikolaj Izdebski - 5.1-3 -- Avoid calling XMvn from build-classpath - -* Tue May 31 2016 Mikolaj Izdebski - 5.1-2 -- Add missing JARs to BND classpath - -* Thu Mar 24 2016 Mikolaj Izdebski - 5.1-1 -- Update to upstream version 5.1 - -* Thu Feb 04 2016 Fedora Release Engineering - 5.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Aug 06 2015 Michael Simacek - 5.0.4-1 -- Update to upstream version 5.0.4 - -* Wed Jun 17 2015 Fedora Release Engineering - 5.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jul 20 2014 Mikolaj Izdebski - 5.0.3-1 -- Update to upstream version 5.0.3 - -* Sat Jun 07 2014 Fedora Release Engineering - 5.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 5 2014 Mikolaj Izdebski - 5.0.2-1 -- Update to upstream version 5.0.2 - -* Mon Apr 14 2014 Mat Booth - 5.0.1-2 -- SCL-ize package. -- Fix bogus dates in changelog. - -* Mon Mar 24 2014 Mikolaj Izdebski - 5.0.1-1 -- Update to upstream version 5.0.1 - -* Wed Mar 19 2014 Mikolaj Izdebski - 5.0-0.3.beta -- Enable asm-debug-all module - -* Mon Jan 20 2014 Mikolaj Izdebski - 5.0-0.2.beta -- Remove Eclipse Orbit alias - -* Tue Dec 3 2013 Mikolaj Izdebski - 5.0-0.1.beta -- Update to 5.0 beta - -* Sat Aug 03 2013 Fedora Release Engineering - 0:3.3.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Mar 6 2013 Mikolaj Izdebski - 0:3.3.1-7 -- Make jetty orbit depmap point to asm-all jar -- Resolves: rhbz#917625 - -* Mon Mar 4 2013 Mikolaj Izdebski - 0:3.3.1-6 -- Add depmap for org.eclipse.jetty.orbit -- Resolves: rhbz#917625 - -* Thu Feb 14 2013 Fedora Release Engineering - 0:3.3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jul 20 2012 Fedora Release Engineering - 0:3.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0:3.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Sep 16 2011 Alexander Kurtakov 0:3.3.1-2 -- Use poms produced by the build not foreign ones. -- Adpat to current guidelines. - -* Mon Apr 04 2011 Chris Aniszczyk 0:3.3.1 -- Upgrade to 3.3.1 - -* Tue Feb 08 2011 Fedora Release Engineering - 0:3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jul 13 2010 Orion Poplawski 0:3.2.1-2 -- Change depmap parent id to asm (bug #606659) - -* Thu Apr 15 2010 Fernando Nasser 0:3.2.1 -- Upgrade to 3.2 - -* Sat Jul 25 2009 Fedora Release Engineering - 0:3.1-7.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0:3.1-6.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Oct 23 2008 David Walluck 0:3.1-5.1 -- build for Fedora - -* Thu Oct 23 2008 David Walluck 0:3.1-5 -- add OSGi manifest (Alexander Kurtakov) - -* Mon Oct 20 2008 David Walluck 0:3.1-4 -- remove Class-Path from MANIFEST.MF -- add unversioned javadoc symlink -- remove javadoc scriptlets -- fix directory ownership -- remove build requirement on dos2unix - -* Fri Feb 08 2008 Ralph Apel - 0:3.1-3jpp -- Add poms and depmap frags with groupId of org.objectweb.asm ! -- Add asm-all.jar -- Add -javadoc Requires post and postun -- Restore Vendor, Distribution - -* Thu Nov 22 2007 Fernando Nasser - 0:3.1-2jpp -- Fix EOL of txt files -- Add dependency on jaxp - -* Thu Nov 22 2007 Fernando Nasser - 0:3.1-1jpp -- Upgrade to 3.1 - -* Wed Aug 22 2007 Fernando Nasser - 0:3.0-1jpp -- Upgrade to 3.0 -- Rename to include objectweb- prefix as requested by ObjectWeb - -* Thu Jan 05 2006 Fernando Nasser - 0:2.1-2jpp -- First JPP 1.7 build - -* Thu Oct 06 2005 Ralph Apel 0:2.1-1jpp -- Upgrade to 2.1 - -* Fri Mar 11 2005 Sebastiano Vigna 0:2.0.RC1-1jpp -- First release of the 2.0 line. diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 0d484d7..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_contexts: - - bodhi_update_push_testing - - bodhi_update_push_stable -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index b5a3d3a..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -set -e - -name=objectweb-asm -version="$(sed -n 's/Version:\s*//p' *.spec)" -gittag="ASM_${version//./_}" - -# RETRIEVE -wget "https://gitlab.ow2.org/asm/asm/-/archive/${gittag}/asm-${gittag}.tar.gz" -O "${name}-${version}.orig.tar.gz" - -rm -rf tarball-tmp -mkdir tarball-tmp -pushd tarball-tmp -tar -xzf "../${name}-${version}.orig.tar.gz" - -# Rename dir not to contain commit -mv asm-${gittag} ${name}-${version} - -# CLEAN TARBALL -# Remove all jar files -find -name '*.jar' -delete -# Remove all class files except those in asm-test, which are shipped alongside appropriately licensed source -find */asm{,-analysis,-commons} -name '*.class' -delete -rm -r */gradle - -tar -czf "../${name}-${version}.tar.gz" * -popd -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 27e6805..2efdbfa 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,38 +1,24 @@ -%bcond_with bootstrap +%{?scl:%scl_package objectweb-asm} +%{!?scl:%global pkg_name %{name}} -Name: objectweb-asm -Version: 9.7.1 -Release: %autorelease +Name: %{?scl_prefix}objectweb-asm +Version: 5.0.4 +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework -License: BSD-3-Clause -URL: https://asm.ow2.org/ +License: BSD +URL: http://asm.ow2.org/ BuildArch: noarch -ExclusiveArch: %{java_arches} noarch -# ./generate-tarball.sh -Source0: %{name}-%{version}.tar.gz -Source1: aggregator.pom -Source2: https://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom -Source3: https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom -Source4: https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom -Source5: https://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom -Source6: https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom -Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom -# The source contains binary jars that cannot be verified for licensing and could be proprietary -Source9: generate-tarball.sh -Source10: tools-retrofitter.pom +Source0: http://download.forge.ow2.org/asm/asm-%{version}.tar.gz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -Patch: 0001-Add-support-of-Java-25.patch +BuildRequires: ant +BuildRequires: aqute-bnd +BuildRequires: maven-local +%{?scl:Requires: %scl_runtime} -%if %{with bootstrap} -BuildRequires: javapackages-bootstrap -%else -BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.ow2.asm:asm) -%endif -# TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 9.7.1-9 +Obsoletes: %{?scl_prefix}objectweb-asm4 < 5 +Provides: %{?scl_prefix}objectweb-asm4 = %{version}-%{release} %description ASM is an all purpose Java bytecode manipulation and analysis @@ -41,38 +27,156 @@ generate classes, directly in binary form. Provided common transformations and analysis algorithms allow to easily assemble custom complex transformations and code analysis tools. +%package javadoc +Summary: API documentation for %{pkg_name} + +%description javadoc +This package provides %{summary}. + %prep -%autosetup -p1 -C +%setup -q -n asm-%{version} +find -name *.jar -delete -# A custom pom to aggregate the build -cp -p %{SOURCE1} pom.xml - -cp -p %{SOURCE10} tools/retrofitter/pom.xml - -# Insert poms into modules -for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do - cp -p ${RPM_SOURCE_DIR}/${pom}-%{version}.pom ${pom}/pom.xml - %pom_add_dep org.fedoraproject.xmvn.objectweb-asm:tools-retrofitter::provided ${pom} - %pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin ${pom} - %pom_set_parent org.fedoraproject.xmvn.objectweb-asm:aggregator:any ${pom} - %pom_xpath_inject pom:parent '..' ${pom} -done - -# Don't ship poms used for build only -%mvn_package :aggregator __noinstall -%mvn_package :tools-retrofitter __noinstall - -# Don't ship the test framework to avoid runtime dep on junit -%mvn_package :asm-test __noinstall +sed -i /Class-Path/d archive/*.bnd +sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/asm-xml.bnd +sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd`|" archive/*.xml +sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath %build -%mvn_build -j -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%ant -Dobjectweb.ant.tasks.path= jar jdoc %install -%mvn_install +%{?scl:scl enable %{scl} - <<"EOF"} +%mvn_artifact output/dist/lib/asm-parent-%{version}.pom +for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all all/asm-debug-all; do + %mvn_artifact output/dist/lib/${m}-%{version}.pom \ + output/dist/lib/${m}-%{version}.jar +done +%mvn_install -J output/dist/doc/javadoc/user +%{?scl:EOF} + +%jpackage_script org.objectweb.asm.xml.Processor "" "" %{pkg_name}/asm:%{pkg_name}/asm-attrs:%{pkg_name}/asm-util:%{pkg_name}/asm-xml %{pkg_name}-processor true %files -f .mfiles -%license LICENSE.txt +%doc LICENSE.txt README.txt +%{_bindir}/%{pkg_name}-processor +%dir %{_javadir}/%{pkg_name} + +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt %changelog -%autochangelog +* Thu Feb 04 2016 Fedora Release Engineering - 5.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Aug 06 2015 Michael Simacek - 5.0.4-1 +- Update to upstream version 5.0.4 + +* Wed Jun 17 2015 Fedora Release Engineering - 5.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jul 20 2014 Mikolaj Izdebski - 5.0.3-1 +- Update to upstream version 5.0.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 5.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 5 2014 Mikolaj Izdebski - 5.0.2-1 +- Update to upstream version 5.0.2 + +* Mon Apr 14 2014 Mat Booth - 5.0.1-2 +- SCL-ize package. +- Fix bogus dates in changelog. + +* Mon Mar 24 2014 Mikolaj Izdebski - 5.0.1-1 +- Update to upstream version 5.0.1 + +* Wed Mar 19 2014 Mikolaj Izdebski - 5.0-0.3.beta +- Enable asm-debug-all module + +* Mon Jan 20 2014 Mikolaj Izdebski - 5.0-0.2.beta +- Remove Eclipse Orbit alias + +* Tue Dec 3 2013 Mikolaj Izdebski - 5.0-0.1.beta +- Update to 5.0 beta + +* Sat Aug 03 2013 Fedora Release Engineering - 0:3.3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 6 2013 Mikolaj Izdebski - 0:3.3.1-7 +- Make jetty orbit depmap point to asm-all jar +- Resolves: rhbz#917625 + +* Mon Mar 4 2013 Mikolaj Izdebski - 0:3.3.1-6 +- Add depmap for org.eclipse.jetty.orbit +- Resolves: rhbz#917625 + +* Thu Feb 14 2013 Fedora Release Engineering - 0:3.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jul 20 2012 Fedora Release Engineering - 0:3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0:3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Sep 16 2011 Alexander Kurtakov 0:3.3.1-2 +- Use poms produced by the build not foreign ones. +- Adpat to current guidelines. + +* Mon Apr 04 2011 Chris Aniszczyk 0:3.3.1 +- Upgrade to 3.3.1 + +* Tue Feb 08 2011 Fedora Release Engineering - 0:3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jul 13 2010 Orion Poplawski 0:3.2.1-2 +- Change depmap parent id to asm (bug #606659) + +* Thu Apr 15 2010 Fernando Nasser 0:3.2.1 +- Upgrade to 3.2 + +* Sat Jul 25 2009 Fedora Release Engineering - 0:3.1-7.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:3.1-6.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Oct 23 2008 David Walluck 0:3.1-5.1 +- build for Fedora + +* Thu Oct 23 2008 David Walluck 0:3.1-5 +- add OSGi manifest (Alexander Kurtakov) + +* Mon Oct 20 2008 David Walluck 0:3.1-4 +- remove Class-Path from MANIFEST.MF +- add unversioned javadoc symlink +- remove javadoc scriptlets +- fix directory ownership +- remove build requirement on dos2unix + +* Fri Feb 08 2008 Ralph Apel - 0:3.1-3jpp +- Add poms and depmap frags with groupId of org.objectweb.asm ! +- Add asm-all.jar +- Add -javadoc Requires post and postun +- Restore Vendor, Distribution + +* Thu Nov 22 2007 Fernando Nasser - 0:3.1-2jpp +- Fix EOL of txt files +- Add dependency on jaxp + +* Thu Nov 22 2007 Fernando Nasser - 0:3.1-1jpp +- Upgrade to 3.1 + +* Wed Aug 22 2007 Fernando Nasser - 0:3.0-1jpp +- Upgrade to 3.0 +- Rename to include objectweb- prefix as requested by ObjectWeb + +* Thu Jan 05 2006 Fernando Nasser - 0:2.1-2jpp +- First JPP 1.7 build + +* Thu Oct 06 2005 Ralph Apel 0:2.1-1jpp +- Upgrade to 2.1 + +* Fri Mar 11 2005 Sebastiano Vigna 0:2.0.RC1-1jpp +- First release of the 2.0 line. diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index ae17c0c..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 -execute: - how: tmt diff --git a/sources b/sources index e1a2064..e0cbd58 100644 --- a/sources +++ b/sources @@ -1,7 +1,2 @@ -SHA512 (objectweb-asm-9.7.1.tar.gz) = 201c490ac71196b1a47a73d7311a22efca833c92377d02d9071cabc2429032aaa7eb636dfbf8182b71af60830d65792dd8f0b423208fcaba78a800228717aee5 -SHA512 (asm-9.7.1.pom) = 9d69abaf9c15b97d37484246c951acc55d4a944496ab47079dc600b3cd90353090b4a3579f1f7eb2e6d778e6900a5e1427f1690a4459253f3b9270c01713f54d -SHA512 (asm-analysis-9.7.1.pom) = 860702b32e5034109beee7cfb9269e33a55fe50ee3ef8c7fe6c71d9916b2be8865991aab64618f9e03be88879bb410e07db74cf91bd7364956cd34d0fbf9231b -SHA512 (asm-commons-9.7.1.pom) = d4bd178cfde200ed04915e581dd1e7009b1960ef40c86e9c22d88ef141d4a32c7e6131ee2e48f92eba45d523006799c8be53312dc50c67ed7b8bb8b90175e480 -SHA512 (asm-test-9.7.1.pom) = e36d8f602a9e9e24547af4f8b0aa0a57f79123c7075ae4085d80e93d3b8ea63730f59e85ee81a4dff45b8749ded0c1ab787620bb5c9820460761fde9578b8868 -SHA512 (asm-tree-9.7.1.pom) = f66d75d0897916d0e3a7ffe4dedd2ca4a363cba0430cc464a358e71be19e8413ba9f26b313f6eb7c0fcc631487e5a420f7bcf6af63c07e3d9880e8adc83922b7 -SHA512 (asm-util-9.7.1.pom) = 6a67ceafce03eb0582dd1addf79ff69cf2a94824f860161cd9b5c808580fd28ce2deb4e25b2b977a70da86732d20de1e895005c824e49d6148637c2211374ff4 +bc328e4336a4fc30636b395b7f8081f3 asm-5.0.4.tar.gz +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt diff --git a/tools-retrofitter.pom b/tools-retrofitter.pom deleted file mode 100644 index bd1f813..0000000 --- a/tools-retrofitter.pom +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - org.fedoraproject.xmvn.objectweb-asm - tools-retrofitter - any - jar - - - - org.ow2.asm - asm - any - - -