Add missing xsom and rngom dependencies

During the update to upstream 2.2.5 the patch that adds the
depencencies for xsom and rngom was updated incorrectly.
althought that is not strictly required as it is also a transitive

glassfish-jaxb-add-dependencies.patch

@@ -66,22 +66,25 @@
      <modelVersion>4.0.0</modelVersion>
      <groupId>com.sun.xml.bind</groupId>
      <artifactId>jaxb-xjc</artifactId>
-@@ -91,6 +85,37 @@
+@@ -91,6 +85,45 @@
          <url>http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri</url>
      </scm>
  
 +    <dependencies>
 +      <dependency>
-+            <groupId>isorelax</groupId>
++        <groupId>com.sun.codemodel</groupId>
-+            <artifactId>isorelax</artifactId>
++        <artifactId>codemodel</artifactId>
-+            <scope>system</scope>
++        <version>2.6</version>
-+            <systemPath>/usr/share/java/isorelax.jar</systemPath>
 +      </dependency>
 +      <dependency>
-+            <groupId>msv-msv</groupId>
++        <groupId>com.sun.xml.dtd-parser</groupId>
-+            <artifactId>msv-msv</artifactId>
++        <artifactId>dtd-parser</artifactId>
-+            <scope>system</scope>
++        <version>1.2-SNAPSHOT</version>
-+            <systemPath>/usr/share/java/msv-msv.jar</systemPath>
++      </dependency>
++      <dependency>
++        <groupId>com.sun.istack</groupId>
++        <artifactId>istack-commons-tools</artifactId>
++        <version>2.6.1</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>relaxngDatatype</groupId>
@@ -90,13 +93,18 @@
 +        <systemPath>/usr/share/java/relaxngDatatype.jar</systemPath>
 +      </dependency>
 +      <dependency>
-+            <groupId>com.sun.istack</groupId>
++        <groupId>xml-resolver</groupId>
-+            <artifactId>istack-commons-runtime</artifactId>
++        <artifactId>xml-resolver</artifactId>
-+            <version>2.6.1</version>
++        <version>1.2</version>
 +      </dependency>
 +      <dependency>
-+            <groupId>com.sun.xml.txw2</groupId>
++        <groupId>org.kohsuke.rngom</groupId>
-+            <artifactId>txw2</artifactId>
++        <artifactId>rngom</artifactId>
++        <version>201103-SNAPSHOT</version>
++      </dependency>
++      <dependency>
++        <groupId>com.sun.xsom</groupId>
++        <artifactId>xsom</artifactId>
 +        <version>20110809</version>
 +      </dependency>
 +    </dependencies>

glassfish-jaxb.spec

@@ -1,6 +1,6 @@
 Name: glassfish-jaxb
 Version: 2.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: JAXB Reference Implementation
 
 Group: Development/Libraries
@@ -69,10 +69,12 @@ BuildRequires: jing
 BuildRequires: stax-ex
 BuildRequires: isorelax
 BuildRequires: xsom
+BuildRequires: rngom
 
 Requires: glassfish-dtd-parser
 Requires: xml-commons-resolver
 Requires: xsom
+Requires: rngom
 Requires: isorelax
 Requires: jing
 Requires: stax-ex
@@ -202,6 +204,9 @@ cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
 
 
 %changelog
+* Tue Mar 13 2012 Juan Hernandez <juan.hernandez@redhat.com> 2.2.5-2
+- Add missing xsom and rngom dependencies to the POM files
+
 * Sat Mar 10 2012 Juan Hernandez <juan.hernandez@redhat.com> 2.2.5-1
 - Updated to upstream version 2.2.5
 - Removed classpath from manifest files