[objectweb-asm4] Upgrade to 4.1
gil
gil at fedoraproject.org
Tue Oct 23 11:00:00 UTC 2012
commit 0bac121ca0d445838c979de457eaafbc8e612b02
Author: gil <puntogil at libero.it>
Date: Tue Oct 23 12:59:40 2012 +0200
Upgrade to 4.1
.gitignore | 1 +
asm4-4.1-fix-xml-manifest.patch | 20 +++++++++++++++++
objectweb-asm4.spec | 46 ++++++++++++++++++++++-----------------
sources | 2 +-
4 files changed, 48 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a905880..8a54773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/asm-4.0.tar.gz
+/asm-4.1.tar.gz
diff --git a/asm4-4.1-fix-xml-manifest.patch b/asm4-4.1-fix-xml-manifest.patch
new file mode 100644
index 0000000..e08e904
--- /dev/null
+++ b/asm4-4.1-fix-xml-manifest.patch
@@ -0,0 +1,20 @@
+--- archive/asm-xml.bnd 2012-10-12 20:56:44.000000000 +0200
++++ archive/asm-xml.bnd-gil 2012-10-19 18:14:41.534123148 +0200
+@@ -32,7 +32,6 @@
+ Implementation-Title: ASM XML classes
+ Implementation-Version: ${product.artifact}
+ Implementation-Vendor: Eugene Kuleshov
+-Class-Path: asm-${product.artifact}.jar asm-util-${product.artifact}.jar asm-attrs-${product.artifact}.jar
+ Main-Class: org.objectweb.asm.xml.Processor
+
+ Bundle-Name: ASM xml classes
+@@ -46,7 +45,8 @@
+
+ Import-Package: \
+ javax.xml.transform.*;resolution:="optional",\
+- org.xml.sax.*;resolution:="optional"
++ org.xml.sax.*;resolution:="optional",\
++ org.objectweb.asm.*;version:="[${product.artifact},${product.artifact}]"
+
+ Bundle-RequiredExecutionEnvironment: J2SE-1.3
+
diff --git a/objectweb-asm4.spec b/objectweb-asm4.spec
index c1743bb..324562b 100644
--- a/objectweb-asm4.spec
+++ b/objectweb-asm4.spec
@@ -29,22 +29,24 @@
#
Name: objectweb-asm4
-Version: 4.0
-Release: 2%{?dist}
+Version: 4.1
+Release: 1%{?dist}
Epoch: 0
Summary: A code manipulation tool to implement adaptable systems
License: BSD
URL: http://asm.objectweb.org/
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
+# remove classpath from asm-xml manifest
+# and fix Import-Package value
+Patch0: asm4-%{version}-fix-xml-manifest.patch
# Needed by asm-xml.jar
Requires: xml-commons-jaxp-1.3-apis
Requires: 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: aqute-bnd
BuildRequires: objectweb-anttask
BuildRequires: xml-commons-jaxp-1.3-apis
BuildRequires: zip
@@ -64,13 +66,16 @@ This package contains javadoc for %{name}.
%prep
%setup -q -n asm-%{version}
sed -i 's/\r//' LICENSE.txt README.txt
+
%patch0 -p0
# update asm gId
sed -i "s|<groupId>asm</groupId>|<groupId>org.ow2.asm</groupId>|" archive/*.pom
+# fix system bndlib location. disable eclipse support ... unavailable deps
+sed -i 's,${config}/biz.aQute.bnd.jar,%{_javadir}/aqute-bnd.jar,;s,eclipse="true",eclipse="false",' archive/*.xml
-mkdir META-INF
-cp -p %{SOURCE1} META-INF/MANIFEST.MF
+# eclipse plugin manifest headers
+sed -i "s,Bundle-Vendor: France Telecom R&D,Bundle-Vendor: %providerName,;s,Bundle-Name: ASM all classes with debug info,Bundle-Name: %pluginName," archive/asm-all.bnd
%build
@@ -82,27 +87,25 @@ ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc
install -d -m 755 %{buildroot}%{_javadir}/%{name}
install -d -m 755 %{buildroot}%{_mavenpomdir}
for jar in output/dist/lib/*.jar; do
- install -m 644 ${jar} %{buildroot}%{_javadir}/%{name}/
+ install -m 644 ${jar} %{buildroot}%{_javadir}/%{name}/`basename ${jar/-%{version}/}`
done
-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 %{buildroot}%{_javadir}/%{name}/
-install -pm 644 output/dist/lib/all/asm-all-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-asm-all-%{version}.pom
+install -m 644 output/dist/lib/all/asm-all-%{version}.jar %{buildroot}%{_javadir}/%{name}/asm-all.jar
+install -pm 644 output/dist/lib/all/asm-all-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-asm-all.pom
# pom
for pom in output/dist/lib/*.pom; do
- install -pm 644 ${pom} %{buildroot}%{_mavenpomdir}/JPP.%{name}-`basename ${pom}`
+ install -pm 644 ${pom} %{buildroot}%{_mavenpomdir}/JPP.%{name}-`basename ${pom/-%{version}/}`
done
-%add_maven_depmap JPP.%{name}-asm-%{version}.pom %{name}/asm-%{version}.jar
-%add_maven_depmap JPP.%{name}-asm-analysis-%{version}.pom %{name}/asm-analysis-%{version}.jar
-%add_maven_depmap JPP.%{name}-asm-commons-%{version}.pom %{name}/asm-commons-%{version}.jar
-%add_maven_depmap JPP.%{name}-asm-tree-%{version}.pom %{name}/asm-tree-%{version}.jar
-%add_maven_depmap JPP.%{name}-asm-util-%{version}.pom %{name}/asm-util-%{version}.jar
-%add_maven_depmap JPP.%{name}-asm-xml-%{version}.pom %{name}/asm-xml-%{version}.jar
-%add_maven_depmap JPP.%{name}-asm-all-%{version}.pom %{name}/asm-all-%{version}.jar
-%add_maven_depmap JPP.%{name}-asm-parent-%{version}.pom
+%add_maven_depmap JPP.%{name}-asm.pom %{name}/asm.jar
+%add_maven_depmap JPP.%{name}-asm-analysis.pom %{name}/asm-analysis.jar
+%add_maven_depmap JPP.%{name}-asm-commons.pom %{name}/asm-commons.jar
+%add_maven_depmap JPP.%{name}-asm-tree.pom %{name}/asm-tree.jar
+%add_maven_depmap JPP.%{name}-asm-util.pom %{name}/asm-util.jar
+%add_maven_depmap JPP.%{name}-asm-xml.pom %{name}/asm-xml.jar
+%add_maven_depmap JPP.%{name}-asm-all.pom %{name}/asm-all.jar
+%add_maven_depmap JPP.%{name}-asm-parent.pom
# javadoc
install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
@@ -120,6 +123,9 @@ cp -pr output/dist/doc/javadoc/user/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt
%changelog
+* Fri Oct 19 2012 gil cattaneo <puntogil at libero.it> 0:4.1-1
+- Upgrade to 4.1
+
* Thu Aug 02 2012 gil cattaneo <puntogil at libero.it> 0:4.0-2
- Fixed epoch
diff --git a/sources b/sources
index 247e80a..d992cfa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f977bf44176a6a5ba71b6789ea757eba asm-4.0.tar.gz
+cbfd7445edc517e0867ad410e48cb106 asm-4.1.tar.gz
More information about the scm-commits
mailing list