[jackson] Don't bundle ASM classes (#842603)

[Juan Hernandez]

commit d863a603c1ecf2670a6c7da8c900cf4d185522b7
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date:   Tue Jul 24 11:59:19 2012 +0200

    Don't bundle ASM classes (#842603)

 jackson-dont-bundle-asm.patch |   29 +++++++++++++++++++++++++++++
 jackson.spec                  |    9 ++++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/jackson-dont-bundle-asm.patch b/jackson-dont-bundle-asm.patch
new file mode 100644
index 0000000..73b8c76
--- /dev/null
+++ b/jackson-dont-bundle-asm.patch
@@ -0,0 +1,29 @@
+From c1ecd81ad5971c901663749650b65a30ed398661 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Tue, 24 Jul 2012 11:55:39 +0200
+Subject: [PATCH] Don't bundle asm classes
+
+---
+ build.xml |    6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 4613994..447f095 100644
+--- a/build.xml
++++ b/build.xml
+@@ -272,12 +272,6 @@ compile.smile, compile.mrbean" />
+         	<!-- 1.6, [JACKSON-278]: need to copy VERSION info along (so unit tests see it) -->
+         </javac>
+         <copy file="${dir.build}/VERSION.txt" toDir="${dir.build.classes.mrbean}/org/codehaus/jackson/mrbean" />
+-        <!-- also, unpack classes from repackaged asm jar, for OSGi bundle -->
+-        <unjar dest="${dir.build.classes.mrbean}">
+-          <fileset dir="${dir.lib}/repackaged">
+-            <include name="jackson-asm*.jar" />
+-          </fileset>
+-        </unjar>
+     </target>
+ 
+     <target name="compile.extra" depends="compile.main">
+-- 
+1.7.10.4
+
diff --git a/jackson.spec b/jackson.spec
index 3e81ea0..9b48ab9 100644
--- a/jackson.spec
+++ b/jackson.spec
@@ -1,6 +1,6 @@
 Name: jackson
 Version: 1.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Jackson Java JSON-processor
 
 Group: Development/Libraries
@@ -16,6 +16,9 @@ Patch0: %{name}-build-plain-jars-instead-of-osgi-bundles.patch
 # Don't require a repackaged version of ASM:
 Patch1: %{name}-dont-require-repackaged-asm.patch
 
+# Don't bundle the ASM classes:
+Patch2: %{name}-dont-bundle-asm.patch
+
 BuildArch: noarch
 
 Requires: java
@@ -56,6 +59,7 @@ This package contains javadoc for %{name}.
 %setup -q -n %{name}-src-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Remove all the binary jar files, as the packaging policies
 # forbids using them:
@@ -124,6 +128,9 @@ cp -rp dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}/.
 
 
 %changelog
+* Tue Jul 24 2012 Juan Hernandez <juan.hernandez at redhat.com> - 1.9.4-5
+- Don't bundle ASM classes (#842603)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild