!2 Update to version 1.3.7

From: @wang--ge 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

xom-build.patch

@@ -1,139 +0,0 @@
-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" />
--    <property name="jaxen.dir"       value="${build.dir}/jaxen-classes"/>
- 
-     <property name="xml-apis.jar"   value="${lib.dir}/xml-apis.jar"/>
-     <property name="parser.jar"     value="${lib.dir}/dtd-xercesImpl.jar"/>
-     <property name="xslt.jar"       value="${lib.dir}/xalan.jar"/>
-+    <property name="jaxen.jar"      value="${lib.dir}/jaxen.jar"/>
-     <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 @@ subject line. The XOM home page is http://www.xom.nu/
-       <pathelement location="${xml-apis.jar}"/>
-       <pathelement location="${parser.jar}"/>
-       <pathelement location="${junit.jar}"/>
--      <pathelement location="${jaxen.dir}"/>
-+      <pathelement location="${jaxen.jar}"/>
-       <pathelement location="${servlet.jar}"/>
-     </path>
- 
-@@ -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}"/>
--      <pathelement location="${jaxen.dir}"/>
-+      <pathelement location="${jaxen.jar}"/>
-       <pathelement location="${xslt.jar}"/>
-       <pathelement location="${serializer.jar}"/>
-     </path>
-@@ -214,15 +214,15 @@ XOM Build file
-   </target>
- 
- 
--  <target name="compile-core" depends="prepare, compile-jaxen" 
-+  <target name="compile-core" depends="prepare"
-           description="Compile the source code">
-     <javac srcdir="${build.src}"
-            destdir="${build.dest}"
-            debug="${debug}"
-            optimize="${optimize}"
-            deprecation="${deprecation}"
--           target="1.2"
--           source="1.3"
-+           target="1.6"
-+           source="1.6"
-            encoding="UTF-8"
-     	   fork="true"
-            includeAntRuntime="false"
-@@ -253,8 +253,8 @@ XOM Build file
-            debug="${debug}"
-            optimize="${optimize}"
-            deprecation="${deprecation}"
--           target="1.2"
--           source="1.3"
-+           target="1.6"
-+           source="1.6"
-            encoding="UTF-8"
-            includeAntRuntime="false">
-        <classpath refid="compile.class.path"/>
-@@ -270,8 +270,8 @@ XOM Build file
-            debug="${debug}"
-            optimize="${optimize}"
-            deprecation="${deprecation}"
--           target="1.2"
--           source="1.3"
-+           target="1.5"
-+           source="1.5"
-            encoding="UTF-8"
-            failonerror="false"
-            includeAntRuntime="false">
-@@ -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/*">
--
--      <fileset dir="${jaxen.dir}"
--         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"/>
--
-       <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}"
--           target="1.2"
--           source="1.3"
-+           target="1.5"
-+           source="1.5"
-            encoding="UTF-8"
-            includeAntRuntime="false"
-            includes="nu/xom/tools/*">
-@@ -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 -->
--  <target name="maven2" depends="jar, sources.jar, javadoc.jar" >
-+  <target name="maven2" depends="jar" >
-       <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"/>
-@@ -862,14 +856,14 @@ location="${dist.dir}/maven1/xom-maven-${version}.jar" />
-   </target>
- 
- 
--  <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen">
-+  <target name="compile-jaxen" description="Compile Jaxen">
-     <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main"
-            destdir="${build.dir}/jaxen-classes"
-            debug="${debug}"
-            optimize="${optimize}"
-            deprecation="${deprecation}"
--           target="1.2"
--           source="1.3"
-+           target="1.5"
-+           source="1.5"
-            encoding="UTF-8"
-            includeAntRuntime="false"
-            excludes="org/jaxen/dom/** 
-@@ -891,10 +885,6 @@ location="${dist.dir}/maven1/xom-maven-${version}.jar" />
-        <classpath refid="compile.class.path"/>
-     </javac>  
-   </target>
--  
--  <target name="get-jaxen" description="Download Jaxen source code" depends="prepare">
--      <unzip src="jaxen-${jaxenversion}-src.zip" dest="${build.dir}" />
--  </target>
- 
-   <target name="debug" depends="init" description="Print various Ant properties">
-     <echoproperties/>

xom.spec

@@ -2,13 +2,12 @@
 %define without_dom4j %{!?_with_dom4j:1}%{?_with_dom4j:0}
 Summary:             XML Object Model
 Name:                xom
-Version:             1.2.10
+Version:             1.3.7
 Release:             1
 Epoch:               0
 License:             LGPLv2
 URL:                 http://www.xom.nu
-Source0:             http://www.cafeconleche.org/XOM/%{name}-%{version}-src.tar.gz
+Source0:             https://github.com/elharo/xom/archive/refs/tags/xom-1.3.7.tar.gz
-Patch0:              %{name}-build.patch
 BuildRequires:       ant >= 0:1.6 javapackages-local javapackages-tools jarjar jaxen junit xalan-j2
 BuildRequires:       xerces-j2
 %if %{with_dom4j}
@@ -38,9 +37,8 @@ Requires:            %{name} = %{version}-%{release}
 This package provides %{summary}.
 
 %prep
-%setup -q -n XOM
+%setup -q -n %{name}-%{version}
 find \( -name '*.jar' -or -name '*.class' \) -delete
-%patch0 -p1
 for s in src/nu/xom/tests/BuilderTest.java\
  src/nu/xom/tests/SerializerTest.java;do
   native2ascii -encoding UTF8 ${s} ${s}
@@ -48,6 +46,8 @@ done
 sed -i 's/\r//g' LICENSE.txt
 sed -i "s,59 Temple Place,51 Franklin Street,;s,Suite 330,Fifth Floor,;s,02111-1307,02110-1301,"  $(find -name "*.java") \
  LICENSE.txt lgpl.txt
+sed -i '/nu.xom.tools.XHTMLJavaDoc/, +4d' ./build.xml
+rm -rf ./src/nu/xom/tools/XHTMLJavaDoc.java
 
 %build
 mkdir -p lib
@@ -72,7 +72,7 @@ ln -sf $(build-classpath dom4j) dom4j.jar
 %endif
 ln -sf $(build-classpath servlet) servlet.jar
 popd
-ant -v compile15 jar samples betterdoc maven2
+ant -v jar samples betterdoc maven2
 pushd build/apidocs
 for f in `find -name \*.css -o -name \*.html`; do
   sed -i 's/\r//g' $f
@@ -111,5 +111,8 @@ ln -s xom/xom.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %{_datadir}/%{name}/xom-samples.jar
 
 %changelog
+* Wed Sep 20 2023 Ge Wang <wang__ge@126.com> - 0:1.3.7-1
+- Update to version 1.3.7
+
 * Thu Jul 23 2020 Jeffery.Gao <gaojianxing@huawei.com> - 1.2.10-1
 - Package init