Update to 5.0 beta

.gitignore

@@ -1 +1,3 @@
 asm-*.tar.gz
+/asm-5.0_BETA.tar.gz
+/LICENSE-2.0.txt

asm-MANIFEST.MF

@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.3
-Bundle-SymbolicName: org.objectweb.asm
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-Version: 3.3.1
-Bundle-Vendor: %providerName
-Export-Package: org.objectweb.asm;version="3.3.1",org.objectweb.asm.co
- mmons;version="3.3.1",org.objectweb.asm.signature;version="3.3.1",org
- .objectweb.asm.tree;version="3.3.1",org.objectweb.asm.tree.analysis;v
- ersion="3.3.1",org.objectweb.asm.util;version="3.3.1",org.objectweb.a
- sm.xml;version="3.3.1"
-

objectweb-asm-no-classpath-in-manifest.patch

@@ -1,10 +0,0 @@
---- asm-3.2/archive/asm-xml.xml.orig	2010-04-19 11:25:13.000000000 -0400
-+++ asm-3.2/archive/asm-xml.xml	2010-04-19 11:25:21.000000000 -0400
-@@ -10,7 +10,6 @@
-         <attribute name="Implementation-Title" value="ASM XML classes"/>
-         <attribute name="Implementation-Version" value="${product.artifact}"/> 
-         <attribute name="Implementation-Vendor" value="Eugene Kuleshov"/>
--        <attribute name="Class-path" value="asm-${product.artifact}.jar asm-util-${product.artifact}.jar asm-attrs-${product.artifact}.jar"/>
-         <attribute name="Main-class" value="org.objectweb.asm.xml.Processor"/>
-       </manifest>
-     </jar>

objectweb-asm.spec

@@ -1,121 +1,69 @@
-# Copyright (c) 2000-2008, JPackage Project
-# 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 JPackage Project 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.
-#
-
 Name:           objectweb-asm
-Version:        3.3.1
+Version:        5.0
-Release:        8%{?dist}
+Release:        0.1.beta%{?dist}
-Epoch:          0
+Summary:        Java bytecode manipulation and analysis framework
-Summary:        A code manipulation tool to implement adaptable systems
 License:        BSD
-URL:            http://asm.objectweb.org/
+URL:            http://asm.ow2.org/
-Group:          Development/Libraries/Java
-Source0:        http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
-Source1:        asm-MANIFEST.MF
-Patch0:         objectweb-asm-no-classpath-in-manifest.patch
-# Needed by asm-xml.jar
-Requires:       xml-commons-jaxp-1.3-apis
-Requires(post): jpackage-utils >= 0:1.7.4
-Requires(postun): jpackage-utils >= 0:1.7.4
-BuildRequires:  jpackage-utils >= 0:1.7.4
-BuildRequires:  java-devel >= 0:1.5.0
-BuildRequires:  ant >= 0:1.6.5
-BuildRequires:  objectweb-anttask
-BuildRequires:  xml-commons-jaxp-1.3-apis
-BuildRequires:  zip
 BuildArch:      noarch
 
+Source0:        http://download.forge.ow2.org/asm/asm-%{version}_BETA.tar.gz
+Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+
+BuildRequires:  ant
+BuildRequires:  aqute-bnd
+BuildRequires:  maven-local
+
+Obsoletes:      %{name}4 < 5
+Provides:       %{name}4 = %{version}-%{release}
+
 %description
-ASM is a code manipulation tool to implement adaptable systems.
+ASM is an all purpose Java bytecode manipulation and analysis
+framework.  It can be used to modify existing classes or dynamically
+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:        Javadoc for %{name}
+Summary:        API documentation for %{name}
-Group:          Documentation
 
 %description    javadoc
-Javadoc for %{name}.
+This package provides %{summary}.
 
 %prep
-%setup -q -n asm-%{version}
+%setup -q -n asm-%{version}_BETA
-%patch0 -p1
+find -name *.jar -delete
-perl -pi -e 's/\r$//g' LICENSE.txt README.txt
+%mvn_alias :asm-all org.eclipse.jetty.orbit:org.objectweb.asm
 
-mkdir META-INF
+sed -i /Class-Path/d archive/*.bnd
-cp -p %{SOURCE1} META-INF/MANIFEST.MF
+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
-ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc
+%ant -Dobjectweb.ant.tasks.path= jar jdoc
 
 %install
-# jars
+%mvn_artifact output/dist/lib/asm-parent-%{version}_BETA.pom
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all; do
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+    %mvn_artifact output/dist/lib/${m}-%{version}_BETA.pom \
-
+                  output/dist/lib/${m}-%{version}_BETA.jar
-for jar in output/dist/lib/*.jar; do
-install -m 644 ${jar} \
-$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar/-%{version}/}`
 done
+%mvn_install -J output/dist/doc/javadoc/user
 
-touch META-INF/MANIFEST.MF
+%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util:%{name}/asm-xml %{name}-processor true
-zip -u output/dist/lib/all/asm-all-%{version}.jar META-INF/MANIFEST.MF
 
-install -m 644 output/dist/lib/all/asm-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/asm-all.jar
+%files -f .mfiles
-install -m 644 output/dist/lib/all/asm-all-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-asm-all.pom
-
-# pom
-for pom in output/dist/lib/*.pom; do
-install -m 644 ${pom} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-`basename ${pom/-%{version}/}`
-done
-%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar
-%add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar
-%add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar
-%add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar
-%add_maven_depmap JPP.objectweb-asm-asm-util.pom %{name}/asm-util.jar
-%add_maven_depmap JPP.objectweb-asm-asm-xml.pom %{name}/asm-xml.jar
-%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar -a "org.eclipse.jetty.orbit:org.objectweb.asm"
-%add_maven_depmap JPP.objectweb-asm-asm-parent.pom
-
-# javadoc
-install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
 %doc LICENSE.txt README.txt
+%{_bindir}/%{name}-processor
 %dir %{_javadir}/%{name}
-%{_javadir}/%{name}/*.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
-%{_javadocdir}/%{name}
+%doc LICENSE.txt
 
 %changelog
+* Tue Dec  3 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.0-0.1.beta
+- Update to 5.0 beta
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:3.3.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

sources

@@ -1 +1,2 @@
-433024df8176f09922646316e415631c  asm-3.3.1.tar.gz
+3025693f410c6e66d5422d4d9c855637  asm-5.0_BETA.tar.gz
+3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt