diff --git a/xom-1.2.10-src.tar.gz b/xom-1.2.10-src.tar.gz deleted file mode 100644 index 2e1d4f4..0000000 Binary files a/xom-1.2.10-src.tar.gz and /dev/null differ diff --git a/xom-1.3.7.tar.gz b/xom-1.3.7.tar.gz new file mode 100644 index 0000000..f1c6a7f Binary files /dev/null and b/xom-1.3.7.tar.gz differ diff --git a/xom-build.patch b/xom-build.patch deleted file mode 100644 index 29482b5..0000000 --- a/xom-build.patch +++ /dev/null @@ -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/ - - - -- - - - - -+ - - - -@@ -107,7 +107,7 @@ subject line. The XOM home page is http://www.xom.nu/ - - - -- -+ - - - -@@ -115,7 +115,7 @@ subject line. The XOM home page is http://www.xom.nu/ - - - -- -+ - - - -@@ -214,15 +214,15 @@ XOM Build file - - - -- - - -@@ -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/*"> -- -- -- - -- -- - - - -@@ -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" /> - -- -+ - - - -@@ -862,14 +856,14 @@ location="${dist.dir}/maven1/xom-maven-${version}.jar" /> - - - -- -+ - - - - -- -- -- -- - - - diff --git a/xom.spec b/xom.spec index 6cd4f9a..c690855 100644 --- a/xom.spec +++ b/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 -Patch0: %{name}-build.patch +Source0: https://github.com/elharo/xom/archive/refs/tags/xom-1.3.7.tar.gz 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 - 0:1.3.7-1 +- Update to version 1.3.7 + * Thu Jul 23 2020 Jeffery.Gao - 1.2.10-1 - Package init