Update to upstream version 6.0

This commit is contained in:
Michael Simacek 2017-10-02 11:37:05 +03:00
parent 418140acc9
commit fb40b7f7bf
3 changed files with 438 additions and 11 deletions

View File

@ -0,0 +1,420 @@
From b99cee6776d45dd79248ba04de516f9d259229f9 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 26 Sep 2017 17:41:25 +0300
Subject: [PATCH] Revert removal of asm-all
---
archive/asm-all.bnd | 70 +++++++++++++++++++++++++++++++++++++++++++++++
archive/asm-all.pom | 45 ++++++++++++++++++++++++++++++
archive/asm-all.xml | 57 ++++++++++++++++++++++++++++++++++++++
archive/asm-debug-all.bnd | 69 ++++++++++++++++++++++++++++++++++++++++++++++
archive/asm-debug-all.pom | 45 ++++++++++++++++++++++++++++++
archive/asm-debug-all.xml | 61 +++++++++++++++++++++++++++++++++++++++++
build.xml | 2 ++
7 files changed, 349 insertions(+)
create mode 100644 archive/asm-all.bnd
create mode 100644 archive/asm-all.pom
create mode 100644 archive/asm-all.xml
create mode 100644 archive/asm-debug-all.bnd
create mode 100644 archive/asm-debug-all.pom
create mode 100644 archive/asm-debug-all.xml
diff --git a/archive/asm-all.bnd b/archive/asm-all.bnd
new file mode 100644
index 00000000..ea0584c0
--- /dev/null
+++ b/archive/asm-all.bnd
@@ -0,0 +1,70 @@
+###############################################################################
+#ASM: a very small and fast Java bytecode manipulation framework
+#Copyright (c) 2000-2011 INRIA, France Telecom
+#All rights reserved.
+#
+#Redistribution and use in source and binary forms, with or without
+#modification, are permitted provided that the following conditions
+#are met:
+#1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#3. Neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+#LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+#THE POSSIBILITY OF SUCH DAMAGE.
+###############################################################################
+
+
+Implementation-Title: ASM all classes
+Implementation-Version: ${product.artifact}
+Implementation-Vendor: France Telecom R&D
+
+Bundle-Name: ASM all classes with debug info
+Bundle-Vendor: France Telecom R&D
+Bundle-Version: ${product.artifact}
+Bundle-DocURL: http://asm.objectweb.org
+Bundle-SymbolicName: org.objectweb.asm.all
+
+Export-Package: \
+ org.objectweb.asm;version=${product.artifact},\
+ org.objectweb.asm.commons;version=${product.artifact},\
+ org.objectweb.asm.signature;version=${product.artifact},\
+ org.objectweb.asm.tree;version=${product.artifact},\
+ org.objectweb.asm.tree.analysis;version=${product.artifact},\
+ org.objectweb.asm.util;version=${product.artifact},\
+ org.objectweb.asm.xml;version=${product.artifact}
+
+Import-Package: \
+ javax.xml.transform.*;resolution:="optional",\
+ org.xml.sax.*;resolution:="optional"
+
+Module-Requires: \
+ java.xml;transitive=true
+
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+
+-pluginpath: \
+ ${out.build}/bnd-module-plugin.jar
+
+-plugin.asm: \
+ org.objectweb.asm.tools.ModuleInfoBndPlugin;
+
+
+-removeheaders:\
+ DSTAMP,\
+ TODAY,\
+ TSTAMP
diff --git a/archive/asm-all.pom b/archive/asm-all.pom
new file mode 100644
index 00000000..d4f123b0
--- /dev/null
+++ b/archive/asm-all.pom
@@ -0,0 +1,45 @@
+<!--
+ ! ASM: a very small and fast Java bytecode manipulation framework
+ ! Copyright (c) 2000-2011 INRIA, France Telecom
+ ! All rights reserved.
+ !
+ ! Redistribution and use in source and binary forms, with or without
+ ! modification, are permitted provided that the following conditions
+ ! are met:
+ ! 1. Redistributions of source code must retain the above copyright
+ ! notice, this list of conditions and the following disclaimer.
+ ! 2. Redistributions in binary form must reproduce the above copyright
+ ! notice, this list of conditions and the following disclaimer in the
+ ! documentation and/or other materials provided with the distribution.
+ ! 3. Neither the name of the copyright holders nor the names of its
+ ! contributors may be used to endorse or promote products derived from
+ ! this software without specific prior written permission.
+ !
+ ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ ! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ ! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ ! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ ! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ ! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ ! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ ! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ ! THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-parent</artifactId>
+ <version>@product.artifact@</version>
+ </parent>
+
+ <name>ASM All</name>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <packaging>jar</packaging>
+
+</project>
diff --git a/archive/asm-all.xml b/archive/asm-all.xml
new file mode 100644
index 00000000..96353561
--- /dev/null
+++ b/archive/asm-all.xml
@@ -0,0 +1,57 @@
+<!--
+ ! ASM: a very small and fast Java bytecode manipulation framework
+ ! Copyright (c) 2000-2011 INRIA, France Telecom
+ ! All rights reserved.
+ !
+ ! Redistribution and use in source and binary forms, with or without
+ ! modification, are permitted provided that the following conditions
+ ! are met:
+ ! 1. Redistributions of source code must retain the above copyright
+ ! notice, this list of conditions and the following disclaimer.
+ ! 2. Redistributions in binary form must reproduce the above copyright
+ ! notice, this list of conditions and the following disclaimer in the
+ ! documentation and/or other materials provided with the distribution.
+ ! 3. Neither the name of the copyright holders nor the names of its
+ ! contributors may be used to endorse or promote products derived from
+ ! this software without specific prior written permission.
+ !
+ ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ ! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ ! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ ! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ ! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ ! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ ! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ ! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ ! THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<project name="asm-all" default="dist">
+
+ <target name="dist" depends="build-jar,build-snapshot"/>
+
+ <target name="build-jar">
+ <mkdir dir="${out.dist.lib}/"/>
+ <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/>
+ <bnd
+ classpath="${out.build}"
+ failok="false"
+ exceptions="true"
+ files="archive/asm-all.bnd"
+ output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
+
+ <copy file="${archive}/asm-all.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
+ <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
+ <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
+ </target>
+
+ <target name="build-snapshot" if="product.snapshot">
+ <mkdir dir="${out.dist.lib}"/>
+ <copy file="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar" toFile="${out.dist.lib}/${ant.project.name}-SNAPSHOT.jar"/>
+ <copy file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" toFile="${out.dist.lib}/${ant.project.name}-SNAPSHOT.pom"/>
+ <echo file="${out.dist.lib}/${ant.project.name}-snapshot-version" message="${product.build.time}"/>
+ </target>
+
+</project>
diff --git a/archive/asm-debug-all.bnd b/archive/asm-debug-all.bnd
new file mode 100644
index 00000000..c9c75a00
--- /dev/null
+++ b/archive/asm-debug-all.bnd
@@ -0,0 +1,69 @@
+###############################################################################
+#ASM: a very small and fast Java bytecode manipulation framework
+#Copyright (c) 2000-2011 INRIA, France Telecom
+#All rights reserved.
+#
+#Redistribution and use in source and binary forms, with or without
+#modification, are permitted provided that the following conditions
+#are met:
+#1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#3. Neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+#LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+#THE POSSIBILITY OF SUCH DAMAGE.
+###############################################################################
+
+
+Implementation-Title: ASM all classes with debug info
+Implementation-Version: ${product.artifact}
+Implementation-Vendor: France Telecom R&D
+
+Bundle-Name: ASM all classes with debug info
+Bundle-Vendor: France Telecom R&D
+Bundle-Version: ${product.artifact}
+Bundle-DocURL: http://asm.objectweb.org
+Bundle-SymbolicName: org.objectweb.asm.all.debug
+
+Export-Package: \
+ org.objectweb.asm;version=${product.artifact},\
+ org.objectweb.asm.commons;version=${product.artifact},\
+ org.objectweb.asm.signature;version=${product.artifact},\
+ org.objectweb.asm.tree;version=${product.artifact},\
+ org.objectweb.asm.tree.analysis;version=${product.artifact},\
+ org.objectweb.asm.util;version=${product.artifact},\
+ org.objectweb.asm.xml;version=${product.artifact}
+
+Import-Package: \
+ javax.xml.transform.*;resolution:="optional",\
+ org.xml.sax.*;resolution:="optional"
+
+Module-Requires: \
+ java.xml;transitive=true
+
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+
+-pluginpath: \
+ ${out.build}/bnd-module-plugin.jar
+
+-plugin.asm: \
+ org.objectweb.asm.tools.ModuleInfoBndPlugin;
+
+-removeheaders:\
+ DSTAMP,\
+ TODAY,\
+ TSTAMP
diff --git a/archive/asm-debug-all.pom b/archive/asm-debug-all.pom
new file mode 100644
index 00000000..ad88584b
--- /dev/null
+++ b/archive/asm-debug-all.pom
@@ -0,0 +1,45 @@
+<!--
+ ! ASM: a very small and fast Java bytecode manipulation framework
+ ! Copyright (c) 2000-2011 INRIA, France Telecom
+ ! All rights reserved.
+ !
+ ! Redistribution and use in source and binary forms, with or without
+ ! modification, are permitted provided that the following conditions
+ ! are met:
+ ! 1. Redistributions of source code must retain the above copyright
+ ! notice, this list of conditions and the following disclaimer.
+ ! 2. Redistributions in binary form must reproduce the above copyright
+ ! notice, this list of conditions and the following disclaimer in the
+ ! documentation and/or other materials provided with the distribution.
+ ! 3. Neither the name of the copyright holders nor the names of its
+ ! contributors may be used to endorse or promote products derived from
+ ! this software without specific prior written permission.
+ !
+ ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ ! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ ! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ ! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ ! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ ! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ ! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ ! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ ! THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-parent</artifactId>
+ <version>@product.artifact@</version>
+ </parent>
+
+ <name>ASM Debug All</name>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-debug-all</artifactId>
+ <packaging>jar</packaging>
+
+</project>
diff --git a/archive/asm-debug-all.xml b/archive/asm-debug-all.xml
new file mode 100644
index 00000000..7a24fa27
--- /dev/null
+++ b/archive/asm-debug-all.xml
@@ -0,0 +1,61 @@
+<!--
+ ! ASM: a very small and fast Java bytecode manipulation framework
+ ! Copyright (c) 2000-2011 INRIA, France Telecom
+ ! All rights reserved.
+ !
+ ! Redistribution and use in source and binary forms, with or without
+ ! modification, are permitted provided that the following conditions
+ ! are met:
+ ! 1. Redistributions of source code must retain the above copyright
+ ! notice, this list of conditions and the following disclaimer.
+ ! 2. Redistributions in binary form must reproduce the above copyright
+ ! notice, this list of conditions and the following disclaimer in the
+ ! documentation and/or other materials provided with the distribution.
+ ! 3. Neither the name of the copyright holders nor the names of its
+ ! contributors may be used to endorse or promote products derived from
+ ! this software without specific prior written permission.
+ !
+ ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ ! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ ! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ ! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ ! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ ! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ ! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ ! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ ! THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<project name="asm-debug-all" default="dist">
+
+ <target name="dist" depends="build-jar,build-snapshot"/>
+
+ <target name="build-jar">
+ <mkdir dir="${out.dist.lib}"/>
+ <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/>
+ <bnd
+ classpath="${out.build}/tmp"
+ failok="false"
+ exceptions="true"
+ files="archive/asm-debug-all.bnd"
+ output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
+
+ <copy file="${archive}/asm-debug-all.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
+ <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
+ <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
+
+ <echo file="${out.dist.lib}/README.txt">It is highly recommended to use only the necessary ASM jars for your
+application instead of using the asm-all jar, unless you really need
+all ASM packages.</echo>
+ </target>
+
+ <target name="build-snapshot" if="product.snapshot">
+ <mkdir dir="${out.dist.lib}"/>
+ <copy file="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar" toFile="${out.dist.lib}/${ant.project.name}-SNAPSHOT.jar"/>
+ <copy file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" toFile="${out.dist.lib}/${ant.project.name}-SNAPSHOT.pom"/>
+ <echo file="${out.dist.lib}/${ant.project.name}-snapshot-version" message="${product.build.time}"/>
+ </target>
+
+</project>
diff --git a/build.xml b/build.xml
index 8a3c2e23..541e6dd4 100644
--- a/build.xml
+++ b/build.xml
@@ -262,6 +262,8 @@
<target name="jar" depends="dist.init,dist.version,compile,retrofit,bnd-module-plugin-jar">
<ant antfile="${archive}/asm.xml" />
+ <ant antfile="${archive}/asm-all.xml" />
+ <ant antfile="${archive}/asm-debug-all.xml" />
<ant antfile="${archive}/asm-analysis.xml" />
<ant antfile="${archive}/asm-commons.xml" />
<ant antfile="${archive}/asm-parent.xml" />
--
2.13.5

View File

@ -1,14 +1,18 @@
Name: objectweb-asm Name: objectweb-asm
Version: 6.0 Version: 6.0
Release: 0.2.beta%{?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/
BuildArch: noarch BuildArch: noarch
Source0: http://download.forge.ow2.org/asm/asm-%{version}_BETA.tar.gz Source0: http://download.forge.ow2.org/asm/asm-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
# Temporarily reintroduces asm-all uberjar, will be removed when we have time
# to fix dependent packages
Patch1: 0001-Revert-removal-of-asm-all.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: aqute-bnd BuildRequires: aqute-bnd
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -28,7 +32,10 @@ Summary: API documentation for %{name}
This package provides %{summary}. This package provides %{summary}.
%prep %prep
%setup -q -n asm-%{version}_BETA %setup -q -n asm-%{version}
%patch1 -p1
find -name *.jar -delete find -name *.jar -delete
sed -i /Class-Path/d archive/*.bnd sed -i /Class-Path/d archive/*.bnd
@ -36,17 +43,14 @@ sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/a
sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4j/simple osgi-core osgi-compendium`|" archive/*.xml sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4j/simple osgi-core osgi-compendium`|" archive/*.xml
sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath
# XXX dirty fix for https://bugzilla.redhat.com/show_bug.cgi?id=1490817
sed -i '/version=/s/${product.artifact}/%{version}.0.BETA/g' archive/*.bnd
%build %build
%ant -Dobjectweb.ant.tasks.path= -Dbiz.aQute.bnd.path= jar jdoc %ant -Dobjectweb.ant.tasks.path= -Dbiz.aQute.bnd.path= jar jdoc
%install %install
%mvn_artifact output/dist/lib/asm-parent-%{version}_BETA.pom %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 for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml asm-all asm-debug-all; do
%mvn_artifact output/dist/lib/${m}-%{version}_BETA.pom \ %mvn_artifact output/dist/lib/${m}-%{version}.pom \
output/dist/lib/${m}-%{version}_BETA.jar output/dist/lib/${m}-%{version}.jar
done done
%mvn_install -J output/dist/doc/javadoc/user %mvn_install -J output/dist/doc/javadoc/user
@ -61,6 +65,9 @@ done
%license LICENSE.txt %license LICENSE.txt
%changelog %changelog
* Mon Sep 25 2017 Michael Simacek <msimacek@redhat.com> - 6.0-1
- Update to upstream version 6.0
* Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0-0.2.beta * Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0-0.2.beta
- Fix invalid OSGi metadata - Fix invalid OSGi metadata
- Resolves: rhbz#1490817 - Resolves: rhbz#1490817

View File

@ -1,2 +1,2 @@
SHA512 (asm-6.0_BETA.tar.gz) = cbdbef0760e2a5f7e07273066351487d0a259ddbecfc8ecd21d7f488a6d76b94a687458e028d99ff6b6615195de091f3d55bcac29f2450515533653fe1eb985e SHA512 (asm-6.0.tar.gz) = a91cdedc87b769ae06b3b198273fadce86f83f3baf2f70f97aa573660234cb948d31a7c30ef77b05f3a1031bc2cc82d151a68b7b45d54af3f7ed99b76057725d
SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8