From e09b05b4daa0ed555ffba1e3bc87ef610e76d653 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Jun 23 2015 17:25:43 +0000
Subject: Depend on pristine jaxen classes


---

diff --git a/xom-build.patch b/xom-build.patch
index ff95af9..29482b5 100644
--- a/xom-build.patch
+++ b/xom-build.patch
@@ -1,6 +1,8 @@
---- build.xml	2013-06-14 14:51:48.987704187 +0200
-+++ build.xml-orig	2013-06-14 15:00:28.607577931 +0200
-@@ -68,11 +68,11 @@
+diff --git a/build.xml b/build.xml
+index afe9c1f..23f2797 100644
+--- a/build.xml
++++ b/build.xml
+@@ -68,11 +68,11 @@ subject line. The XOM home page is http://www.xom.nu/
      <property name="dist.dir"        value="./dist"/>    
      <property name="clover.dir"      value="./clover"/>
      <property name="testreports.dir" value="./testreports" />
@@ -13,7 +15,7 @@
      <property name="serializer.jar" value="${lib.dir}/serializer.jar"/>
      <property name="tagsoup.jar"    value="${lib2.dir}/tagsoup-1.2.jar"/>
      <property name="junit.jar"      value="${lib.dir}/junit.jar"/>
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ subject line. The XOM home page is http://www.xom.nu/
        <pathelement location="${xml-apis.jar}"/>
        <pathelement location="${parser.jar}"/>
        <pathelement location="${junit.jar}"/>
@@ -22,7 +24,7 @@
        <pathelement location="${servlet.jar}"/>
      </path>
  
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ subject line. The XOM home page is http://www.xom.nu/
        <pathelement location="${xml-apis.jar}"/>
        <pathelement location="${parser.jar}"/>
        <pathelement location="${xom-core}"/>
@@ -31,12 +33,12 @@
        <pathelement location="${xslt.jar}"/>
        <pathelement location="${serializer.jar}"/>
      </path>
-@@ -214,15 +214,15 @@
+@@ -214,15 +214,15 @@ XOM Build file
    </target>
  
  
 -  <target name="compile-core" depends="prepare, compile-jaxen" 
-+  <target name="compile-core" depends="prepare" 
++  <target name="compile-core" depends="prepare"
            description="Compile the source code">
      <javac srcdir="${build.src}"
             destdir="${build.dest}"
@@ -45,23 +47,23 @@
             deprecation="${deprecation}"
 -           target="1.2"
 -           source="1.3"
-+           target="1.5"
-+           source="1.5"
++           target="1.6"
++           source="1.6"
             encoding="UTF-8"
      	   fork="true"
             includeAntRuntime="false"
-@@ -253,8 +253,8 @@
+@@ -253,8 +253,8 @@ XOM Build file
             debug="${debug}"
             optimize="${optimize}"
             deprecation="${deprecation}"
 -           target="1.2"
 -           source="1.3"
-+           target="1.5"
-+           source="1.5"
++           target="1.6"
++           source="1.6"
             encoding="UTF-8"
             includeAntRuntime="false">
         <classpath refid="compile.class.path"/>
-@@ -270,8 +270,8 @@
+@@ -270,8 +270,8 @@ XOM Build file
             debug="${debug}"
             optimize="${optimize}"
             deprecation="${deprecation}"
@@ -72,7 +74,7 @@
             encoding="UTF-8"
             failonerror="false"
             includeAntRuntime="false">
-@@ -330,10 +330,6 @@
+@@ -330,13 +330,7 @@ XOM Build file
  		 compress="yes"
           includes="nu/xom/* nu/xom/xslt/* nu/xom/xinclude/* nu/xom/converters/* nu/xom/canonical/* nu/xom/tests/XOMTestCase.class"
           excludes="nu/xom/samples/* nu/xom/benchmarks/* nu/xom/pantry/* nu/xom/tools/*">
@@ -81,9 +83,12 @@
 -         excludes="**Demo.class **/package.html org/jaxen/xom/** org/jaxen/XPathTestBase.class org/jaxen/jdom/** org/jaxen/dom4j/** org/jaxen/javabean/** org/jaxen/dom/** org/jaxen/**Test.class org/jaxen/saxpath/base/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/pattern/** org/jaxen/saxpath/SAXPathParseException.class org/w3c/dom/UserDataHandler.class org/jaxen/pattern/PriorityTest.class">
 -      </fileset>
      
-       <rule pattern="org.jaxen.**" result="nu.xom.jaxen.@1"/>
- 
-@@ -512,8 +508,8 @@
+-      <rule pattern="org.jaxen.**" result="nu.xom.jaxen.@1"/>
+-
+       <manifest>
+         <attribute name="Built-By" value="${user.name}"/>
+         <attribute name="Specification-Title"    value="XOM"/>
+@@ -512,8 +506,8 @@ XOM Build file
             debug="${debug}"
             optimize="${optimize}"
             deprecation="${deprecation}"
@@ -94,7 +99,7 @@
             encoding="UTF-8"
             includeAntRuntime="false"
             includes="nu/xom/tools/*">
-@@ -844,7 +840,7 @@
+@@ -840,7 +834,7 @@ location="${dist.dir}/maven1/xom-maven-${version}.jar" />
    <!-- Generate a Maven 2 JAR for uploading to the maven
        bug repository and hence placement onto ibiblio and mirrors. 
        See http://maven.apache.org/guides/mini/guide-central-repository-upload.html -->
@@ -103,7 +108,7 @@
        <property name="pom2.template" location="project2.xml" />
        <property name="pom2.file" location="${build.dir}/maven2/project.xml" />
        <property name="package.jar" location="${build.dir}/${name}-${version}.jar"/>
-@@ -866,14 +862,14 @@
+@@ -862,14 +856,14 @@ location="${dist.dir}/maven1/xom-maven-${version}.jar" />
    </target>
  
  
@@ -121,7 +126,7 @@
             encoding="UTF-8"
             includeAntRuntime="false"
             excludes="org/jaxen/dom/** 
-@@ -895,10 +891,6 @@
+@@ -891,10 +885,6 @@ location="${dist.dir}/maven1/xom-maven-${version}.jar" />
         <classpath refid="compile.class.path"/>
      </javac>  
    </target>
diff --git a/xom.spec b/xom.spec
index 79664ab..e31e8ce 100644
--- a/xom.spec
+++ b/xom.spec
@@ -36,7 +36,7 @@
 Summary:        XML Object Model
 Name:           xom
 Version:        1.2.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 License:        LGPLv2
 URL:            http://www.xom.nu
@@ -95,7 +95,7 @@ This package provides %{summary}.
 %prep
 %setup -q -n XOM
 
-%patch0
+%patch0 -p1
 
 # fix non ASCII chars
 for s in src/nu/xom/tests/BuilderTest.java\
@@ -178,6 +178,9 @@ install -m 644 build/maven2/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %{_datadir}/%{name}/xom-samples.jar
 
 %changelog
+* Tue Jun 23 2015 Michal Srb <msrb@redhat.com> - 0:1.2.10-3
+- Depend on pristine jaxen classes
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild