Attachment 600773 Details for Bug 843827 – Upgrade to 4.0

[patch] Upgrade to 4.0

0001-Upgrade-to-4.0.patch (text/plain), 5.15 KB, created by gil cattaneo on 2012-07-27 13:26:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-07-27 13:26:36 UTC

Size: 5.15 KB

patch

obsolete

>From 0e9a42466324861fd62ae3677ce194ed2a22d372 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 27 Jul 2012 15:23:12 +0200
>Subject: [PATCH] Upgrade to 4.0
>
>---
> asm4-4.0-MANIFEST.MF                    |   13 ++++++++++++
> asm4-4.0-no-classpath-in-manifest.patch |   10 +++++++++
> objectweb-asm.spec                      |   33 ++++++++++++++++++------------
> sources                                 |    2 +-
> 4 files changed, 44 insertions(+), 14 deletions(-)
> create mode 100644 asm4-4.0-MANIFEST.MF
> create mode 100644 asm4-4.0-no-classpath-in-manifest.patch
>
>diff --git a/asm4-4.0-MANIFEST.MF b/asm4-4.0-MANIFEST.MF
>new file mode 100644
>index 0000000..9793e7d
>--- /dev/null
>+++ b/asm4-4.0-MANIFEST.MF
>@@ -0,0 +1,13 @@
>+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: 4.0
>+Bundle-Vendor: %providerName
>+Export-Package: org.objectweb.asm;version=4.0,org.objectweb.asm.signat
>+ ure;version=4.0,org.objectweb.asm.commons;version=4.0,org.objectweb.a
>+ sm.tree;version=4.0,org.objectweb.asm.tree.analysis;version=4.0,org.o
>+ bjectweb.asm.util;version=4.0,org.objectweb.asm.xml;version=4.0
>+
>diff --git a/asm4-4.0-no-classpath-in-manifest.patch b/asm4-4.0-no-classpath-in-manifest.patch
>new file mode 100644
>index 0000000..9b1a26f
>--- /dev/null
>+++ b/asm4-4.0-no-classpath-in-manifest.patch
>@@ -0,0 +1,10 @@
>+--- archive/asm-xml.xml	2011-09-17 18:09:14.000000000 +0200
>++++ archive/asm-xml.xml-gil	2012-07-26 15:34:48.470646564 +0200
>+@@ -40,7 +40,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>
>diff --git a/objectweb-asm.spec b/objectweb-asm.spec
>index ae90be0..1d76664 100644
>--- a/objectweb-asm.spec
>+++ b/objectweb-asm.spec
>@@ -29,26 +29,29 @@
> #
> 
> Name:           objectweb-asm
>-Version:        3.3.1
>-Release:        4%{?dist}
>+Version:        4.0
>+Release:        1%{?dist}
> Epoch:          0
> Summary:        A code manipulation tool to implement adaptable systems
> License:        BSD
> URL:            http://asm.objectweb.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
>+Group:          Development/Libraries
>+Source0:        http://download.forge.objectweb.org/asm/asm-%{version}.tar.gz
>+Source1:        asm4-%{version}-MANIFEST.MF
>+Patch0:         asm4-%{version}-no-classpath-in-manifest.patch
> 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
>+
>+# Needed by asm-xml.jar
>+Requires:       xml-commons-jaxp-1.3-apis
>+Requires:       java
>+Requires(post): jpackage-utils >= 0:1.7.4
>+Requires(postun): jpackage-utils >= 0:1.7.4
> BuildArch:      noarch
> 
> %description
>@@ -63,7 +66,7 @@ Javadoc for %{name}.
> 
> %prep
> %setup -q -n asm-%{version}
>-%patch0 -p1
>+%patch0 -p0
> perl -pi -e 's/\r$//g' LICENSE.txt README.txt
> 
> mkdir META-INF
>@@ -86,11 +89,11 @@ touch META-INF/MANIFEST.MF
> 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
>-install -m 644 output/dist/lib/all/asm-all-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-asm-all.pom
>+install -pm 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}/}`
>+install -pm 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
>@@ -114,8 +117,12 @@ cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
> %files javadoc
> %{_javadocdir}/%{name}
>+%doc LICENSE.txt
> 
> %changelog
>+* Thu Jul 26 2012 gil cattaneo <puntogil@libero.it> 4.0-1
>+- Upgrade to 4.0
>+
> * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:3.3.1-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 4af6a91..247e80a 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-433024df8176f09922646316e415631c  asm-3.3.1.tar.gz
>+f977bf44176a6a5ba71b6789ea757eba  asm-4.0.tar.gz
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 843827: 600773