From b09f0a8b16a07ea1733b695f41aeef540ed955d7 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 17 Dec 2012 10:54:52 +0200
Subject: [PATCH] Really restore dependencies.

---
 ...ncies-to-system.bundle-and-javax.xml.patch | 56 -------------------
 xerces-j2-manifest.patch                      | 29 +++++-----
 xerces-j2.spec                                |  5 +-
 3 files changed, 19 insertions(+), 71 deletions(-)
 delete mode 100644 0001-Restored-dependencies-to-system.bundle-and-javax.xml.patch

diff --git a/0001-Restored-dependencies-to-system.bundle-and-javax.xml.patch b/0001-Restored-dependencies-to-system.bundle-and-javax.xml.patch
deleted file mode 100644
index a8b17ae..0000000
--- a/0001-Restored-dependencies-to-system.bundle-and-javax.xml.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From bda73cfb7fa39acfeec3f00ee0fa681923af1da6 Mon Sep 17 00:00:00 2001
-From: Krzysztof Daniel <kdaniel@redhat.com>
-Date: Tue, 11 Dec 2012 13:08:43 +0100
-Subject: [PATCH] Restored dependencies to system.bundle and javax.xml.
-
-Lack of those dependencies caused multiple issue with classloading of
-classes available in vm. Some plugins were using those available in vm,
-some those from javax.xml, and when they met, multiple NoClassDefFound
-or ClassCastException were reported (especially in ADT).
----
- xerces-j2-manifest.patch | 2 +-
- xerces-j2.spec           | 7 ++++++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/xerces-j2-manifest.patch b/xerces-j2-manifest.patch
-index 64e0bca..cea5f6e 100644
---- a/xerces-j2-manifest.patch
-+++ b/xerces-j2-manifest.patch
-@@ -10,7 +10,7 @@
- +Bundle-Localization: plugin
- +Bundle-Version: @impl.version@
- +Bundle-Vendor: Apache Software Foundation
--+Require-Bundle: org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
-++Require-Bundle: system.bundle,javax.xml, org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
- +Export-Package: META-INF.services;version="@impl.version@",org.apache.html.dom;version="@impl.version@",org.apache.wml;version="@impl.version@",org.apache.wml.dom;version="@impl.version@",org.apache.xerces.dom;version="@impl.version@",org.apache.xerces.dom.events;version="@impl.version@",org.apache.xerces.dom3.as;version="@impl.version@",org.apache.xerces.impl;version="@impl.version@",org.apache.xerces.impl.dtd;version="@impl.version@",org.apache.xerces.impl.dtd.models;version="@impl.version@",org.apache.xerces.impl.dv;version="@impl.version@",org.apache.xerces.impl.dv.dtd;version="@impl.version@",org.apache.xerces.impl.dv.util;version="@impl.version@",org.apache.xerces.impl.dv.xs;version="@impl.version@",org.apache.xerces.impl.io;version="@impl.version@",org.apache.xerces.impl.msg;version="@impl.version@",org.apache.xerces.impl.validation;version="@impl.version@",org.apache.xerces.impl.xpath;version="@impl.version@",org.apache.xerces.impl.xpath.regex;version="@impl.version@",org.apache.xerces.impl.xs;version="@impl.version@",org.apache.xerces.impl.xs.identity;version="@impl.version@",org.apache.xerces.impl.xs.models;version="@impl.version@",org.apache.xerces.impl.xs.opti;version="@impl.version@",org.apache.xerces.impl.xs.traversers;version="@impl.version@",org.apache.xerces.impl.xs.util;version="@impl.version@",org.apache.xerces.jaxp;version="@impl.version@",org.apache.xerces.jaxp.datatype;version="@impl.version@",org.apache.xerces.jaxp.validation;version="@impl.version@",org.apache.xerces.parsers;version="@impl.version@",org.apache.xerces.stax;version="@impl.version@",org.apache.xerces.stax.events;version="@impl.version@",org.apache.xerces.util;version="@impl.version@",org.apache.xerces.xinclude;version="@impl.version@",org.apache.xerces.xni;version="@impl.version@",org.apache.xerces.xni.grammars;version="@impl.version@",org.apache.xerces.xni.parser;version="@impl.version@",org.apache.xerces.xpointer;version="@impl.version@",org.apache.xerces.xs;version="@impl.version@",org.apache.xerces.xs.datatypes;version="@impl.version@",org.apache.xml.serialize;version="@impl.version@",org.w3c.dom.html;version="@impl.version@"
-  
-  Name: org/apache/xerces/impl/Version.class
-diff --git a/xerces-j2.spec b/xerces-j2.spec
-index 7edc7eb..e7e8277 100644
---- a/xerces-j2.spec
-+++ b/xerces-j2.spec
-@@ -1,8 +1,10 @@
- %global cvs_version 2_11_0
- 
-+%define __requires_exclude system.bundle
-+
- Name:          xerces-j2
- Version:       2.11.0
--Release:       9%{?dist}
-+Release:       10%{?dist}
- Summary:       Java XML parser
- Group:         Development/Libraries
- License:       ASL 2.0
-@@ -206,6 +208,9 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
- %{_datadir}/%{name}
- 
- %changelog
-+* Tue Dec 11 2012 Krzysztof Daniel <kdaniel@redhat.com> 2.11.0-10
-+- Restored dependencies to system.bundle and javax.xml.
-+
- * Tue Sep 25 2012 Krzysztof Daniel <kdaniel@redhat.com> 2.11.0-9
- - Remove javax.xml from required bundles. They are provided by JVM.
- 
--- 
-1.7.11.7
-
diff --git a/xerces-j2-manifest.patch b/xerces-j2-manifest.patch
index 64e0bca..0d4444e 100644
--- a/xerces-j2-manifest.patch
+++ b/xerces-j2-manifest.patch
@@ -1,17 +1,18 @@
 --- src/manifest.xerces.orig	2010-12-11 23:06:53.446251316 +0000
 +++ src/manifest.xerces	2010-12-12 01:02:41.750251153 +0000
 @@ -1,5 +1,14 @@
- Manifest-Version: 1.0
- Created-By: @java.version@ (@java.vendor@)
-+Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-SymbolicName: org.apache.xerces
-+Bundle-ManifestVersion: 2
-+Bundle-Name: @impl.name@
-+Bundle-Localization: plugin
-+Bundle-Version: @impl.version@
-+Bundle-Vendor: Apache Software Foundation
-+Require-Bundle: org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
-+Export-Package: META-INF.services;version="@impl.version@",org.apache.html.dom;version="@impl.version@",org.apache.wml;version="@impl.version@",org.apache.wml.dom;version="@impl.version@",org.apache.xerces.dom;version="@impl.version@",org.apache.xerces.dom.events;version="@impl.version@",org.apache.xerces.dom3.as;version="@impl.version@",org.apache.xerces.impl;version="@impl.version@",org.apache.xerces.impl.dtd;version="@impl.version@",org.apache.xerces.impl.dtd.models;version="@impl.version@",org.apache.xerces.impl.dv;version="@impl.version@",org.apache.xerces.impl.dv.dtd;version="@impl.version@",org.apache.xerces.impl.dv.util;version="@impl.version@",org.apache.xerces.impl.dv.xs;version="@impl.version@",org.apache.xerces.impl.io;version="@impl.version@",org.apache.xerces.impl.msg;version="@impl.version@",org.apache.xerces.impl.validation;version="@impl.version@",org.apache.xerces.impl.xpath;version="@impl.version@",org.apache.xerces.impl.xpath.regex;version="@impl.version@",org.apache.xerces.impl.xs;version="@impl.version@",org.apache.xerces.impl.xs.identity;version="@impl.version@",org.apache.xerces.impl.xs.models;version="@impl.version@",org.apache.xerces.impl.xs.opti;version="@impl.version@",org.apache.xerces.impl.xs.traversers;version="@impl.version@",org.apache.xerces.impl.xs.util;version="@impl.version@",org.apache.xerces.jaxp;version="@impl.version@",org.apache.xerces.jaxp.datatype;version="@impl.version@",org.apache.xerces.jaxp.validation;version="@impl.version@",org.apache.xerces.parsers;version="@impl.version@",org.apache.xerces.stax;version="@impl.version@",org.apache.xerces.stax.events;version="@impl.version@",org.apache.xerces.util;version="@impl.version@",org.apache.xerces.xinclude;version="@impl.version@",org.apache.xerces.xni;version="@impl.version@",org.apache.xerces.xni.grammars;version="@impl.version@",org.apache.xerces.xni.parser;version="@impl.version@",org.apache.xerces.xpointer;version="@impl.version@",org.apache.xerces.xs;version="@impl.version@",org.apache.xerces.xs.datatypes;version="@impl.version@",org.apache.xml.serialize;version="@impl.version@",org.w3c.dom.html;version="@impl.version@"
- 
- Name: org/apache/xerces/impl/Version.class
- Comment: @impl.name@ 
+ Manifest-Version: 1.0
+ Created-By: @java.version@ (@java.vendor@)
++Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-SymbolicName: org.apache.xerces
++Bundle-ManifestVersion: 2
++Bundle-Name: @impl.name@
++Bundle-Localization: plugin
++Bundle-Version: @impl.version@
++Bundle-Vendor: Apache Software Foundation
++Require-Bundle: system.bundle,javax.xml, org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
++Export-Package: META-INF.services;version="@impl.version@",org.apache.html.dom;version="@impl.version@",org.apache.wml;version="@impl.version@",org.apache.wml.dom;version="@impl.version@",org.apache.xerces.dom;version="@impl.version@",org.apache.xerces.dom.events;version="@impl.version@",org.apache.xerces.dom3.as;version="@impl.version@",org.apache.xerces.impl;version="@impl.version@",org.apache.xerces.impl.dtd;version="@impl.version@",org.apache.xerces.impl.dtd.models;version="@impl.version@",org.apache.xerces.impl.dv;version="@impl.version@",org.apache.xerces.impl.dv.dtd;version="@impl.version@",org.apache.xerces.impl.dv.util;version="@impl.version@",org.apache.xerces.impl.dv.xs;version="@impl.version@",org.apache.xerces.impl.io;version="@impl.version@",org.apache.xerces.impl.msg;version="@impl.version@",org.apache.xerces.impl.validation;version="@impl.version@",org.apache.xerces.impl.xpath;version="@impl.version@",org.apache.xerces.impl.xpath.regex;version="@impl.version@",org.apache.xerces.impl.xs;version="@impl.version@",org.apache.xerces.impl.xs.identity;version="@impl.version@",org.apache.xerces.impl.xs.models;version="@impl.version@",org.apache.xerces.impl.xs.opti;version="@impl.version@",org.apache.xerces.impl.xs.traversers;version="@impl.version@",org.apache.xerces.impl.xs.util;version="@impl.version@",org.apache.xerces.jaxp;version="@impl.version@",org.apache.xerces.jaxp.datatype;version="@impl.version@",org.apache.xerces.jaxp.validation;version="@impl.version@",org.apache.xerces.parsers;version="@impl.version@",org.apache.xerces.stax;version="@impl.version@",org.apache.xerces.stax.events;version="@impl.version@",org.apache.xerces.util;version="@impl.version@",org.apache.xerces.xinclude;version="@impl.version@",org.apache.xerces.xni;version="@impl.version@",org.apache.xerces.xni.grammars;version="@impl.version@",org.apache.xerces.xni.parser;version="@impl.version@",org.apache.xerces.xpointer;version="@impl.version@",org.apache.xerces.xs;version="@impl.version@",org.apache.xerces.xs.datatypes;version="@impl.version@",org.apache.xml.serialize;version="@impl.version@",org.w3c.dom.html;version="@impl.version@"
+ 
+ Name: org/apache/xerces/impl/Version.class
+ Comment: @impl.name@ 
+
diff --git a/xerces-j2.spec b/xerces-j2.spec
index e7e8277..ee4a467 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -4,7 +4,7 @@
 
 Name:          xerces-j2
 Version:       2.11.0
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       Java XML parser
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -208,6 +208,9 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
 %{_datadir}/%{name}
 
 %changelog
+* Mon Dec 17 2012 Alexander Kurtakov <akurtako@redhat.com> 2.11.0-11
+- Really restore dependencies.
+
 * Tue Dec 11 2012 Krzysztof Daniel <kdaniel@redhat.com> 2.11.0-10
 - Restored dependencies to system.bundle and javax.xml.