diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch index a2c4014..9d9a26d 100644 --- a/0001-Adapt-build.patch +++ b/0001-Adapt-build.patch @@ -1,14 +1,14 @@ -From 40912d0cdd69b3f327402176ce622078e6d0846d Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 23 Jul 2018 14:30:14 +0200 +From cf7e676edc7ab9d4b8b130ca4d8ecbd291995dea Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 20 Apr 2020 09:29:12 +0200 Subject: [PATCH] Adapt build --- - build.xml | 42 ++++++++++++++++++++++++++---------------- - 1 file changed, 26 insertions(+), 16 deletions(-) + build.xml | 61 +++---------------------------------------------------- + 1 file changed, 3 insertions(+), 58 deletions(-) diff --git a/build.xml b/build.xml -index ed632c2c..78bbe934 100644 +index ed632c2..d80abff 100644 --- a/build.xml +++ b/build.xml @@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file. @@ -26,78 +26,94 @@ index ed632c2c..78bbe934 100644 - - - -+ ++ -@@ -289,6 +279,7 @@ For instructions on how to build JDOM, please view the README.txt file. - header="<b>${Name}<br><font size='-1'>${version}</font></b>" - bottom="Copyright © ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved."> - -+ - +@@ -296,7 +286,7 @@ For instructions on how to build JDOM, please view the README.txt file. + + + +- + + +@@ -316,27 +306,6 @@ For instructions on how to build JDOM, please view the README.txt file. + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- -@@ -378,11 +369,11 @@ For instructions on how to build JDOM, please view the README.txt file. - - -- -+ + +@@ -505,7 +474,7 @@ For instructions on how to build JDOM, please view the README.txt file. + - - -@@ -406,6 +397,7 @@ For instructions on how to build JDOM, please view the README.txt file. - - - -+ - + +- + + +@@ -517,8 +486,6 @@ For instructions on how to build JDOM, please view the README.txt file. - -@@ -533,7 +525,25 @@ For instructions on how to build JDOM, please view the README.txt file. + + +- +- + + + +@@ -532,28 +499,6 @@ For instructions on how to build JDOM, please view the README.txt file. + - +- - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - +- +- + + + -- -2.34.1 +2.37.2 diff --git a/JDOM-2.0.6.1.tar.gz b/JDOM-2.0.6.1.tar.gz deleted file mode 100644 index f243bc2..0000000 --- a/JDOM-2.0.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18639399104d5c57b92fd6791823a74393651e80499b67ae3067294d62df083e -size 8368301 diff --git a/_service b/_service new file mode 100644 index 0000000..0e6060f --- /dev/null +++ b/_service @@ -0,0 +1,17 @@ + + + git + https://github.com/hunterhacker/jdom.git + JDOM-2.0.6.1 + JDOM-* + @PARENT_TAG@ + JDOM-(.*) + lib/* + */lib + + + *.tar + xz + + + diff --git a/jdom-2.0.6.1.tar.xz b/jdom-2.0.6.1.tar.xz new file mode 100644 index 0000000..a877a0a --- /dev/null +++ b/jdom-2.0.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:193268524d7d4a69bc11038e5d7b3b602162efb30cf1a706a27abf397016bec3 +size 458972 diff --git a/jdom-contrib-template.pom b/jdom-contrib-template.pom deleted file mode 100644 index a506d2c..0000000 --- a/jdom-contrib-template.pom +++ /dev/null @@ -1,96 +0,0 @@ - - 4.0.0 - org.jdom - @artifactID@-contrib - jar - - JDOM Contrib - @version@ - - - A complete, Java-based solution for accessing, manipulating, - and outputting XML data - - http://www.jdom.org - - - JDOM - http://www.jdom.org - - - - - JDOM-interest Mailing List - jdom-interest@jdom.org - http://jdom.markmail.org/ - - - - - - Similar to Apache License but with the acknowledgment clause removed - https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt - repo - - - - - - git@github.com:/hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - - - - - hunterhacker - Jason Hunter - jhunter@servlets.com - - - rolfl - Rolf Lear - jdom@tuis.net - - - - - - org.jdom - @artifactID@ - @version@ - - - jaxen - jaxen - 1.1.4 - true - - - xerces - xercesImpl - 2.10.0 - true - - - isorelax - isorelax - 20030108 - true - - - stax - stax-api - 1.0.1 - true - - - - - @jdk@ - - \ No newline at end of file diff --git a/jdom-junit-template.pom b/jdom-junit-template.pom deleted file mode 100644 index 7e8e4fa..0000000 --- a/jdom-junit-template.pom +++ /dev/null @@ -1,120 +0,0 @@ - - 4.0.0 - org.jdom - @artifactID@-junit - jar - - JDOM Junit - @version@ - - - A complete, Java-based solution for accessing, manipulating, - and outputting XML data - - http://www.jdom.org - - - JDOM - http://www.jdom.org - - - - - JDOM-interest Mailing List - jdom-interest@jdom.org - http://jdom.markmail.org/ - - - - - - Similar to Apache License but with the acknowledgment clause removed - https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt - repo - - - - - - git@github.com:/hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - - - - - hunterhacker - Jason Hunter - jhunter@servlets.com - - - rolfl - Rolf Lear - jdom@tuis.net - - - - - - org.jdom - @artifactID@ - @version@ - - - jaxen - jaxen - 1.1.4 - true - - - xerces - xercesImpl - 2.10.0 - true - - - junit - junit - 4.11 - true - - - asm - asm - 3.3.1 - true - - - asm - asm-tree - 3.3.1 - true - - - log4j - log4j - 1.2.17 - true - - - net.sourceforge.cobertura - cobertura - 1.9.4.1 - true - - - net.sourceforge.cobertura - cobertura-runtime - 1.9.4.1 - true - - - - - @jdk@ - - \ No newline at end of file diff --git a/jdom2.changes b/jdom2.changes index f152805..f0a4eb2 100644 --- a/jdom2.changes +++ b/jdom2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Aug 23 14:59:34 UTC 2023 - Fridrich Strba + +- Drop unused *-junit and *-contrib artifacts +- Reduce drastically dependencies +- Modified patch: + * 0001-Adapt-build.patch + + drop junit and contrib jars + ------------------------------------------------------------------- Tue Jan 18 07:47:46 UTC 2022 - Fridrich Strba diff --git a/jdom2.spec b/jdom2.spec index 1688022..0ca5d76 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,7 +1,7 @@ # # spec file for package jdom2 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,24 +23,13 @@ Summary: Java manipulation of XML License: Saxpath Group: Development/Libraries/Java URL: http://www.jdom.org/ -Source0: https://github.com/hunterhacker/jdom/archive/JDOM-%{version}.tar.gz -# originally taken from http://repo1.maven.org/maven2/org/jdom/jdom-contrib/1.1.3/jdom-contrib-1.1.3.pom -Source1: jdom-contrib-template.pom -Source2: jdom-junit-template.pom -# Use system libraries -# Disable gpg signatures -# Process contrib and junit pom files +Source0: jdom-%{version}.tar.xz Patch0: 0001-Adapt-build.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: fdupes -BuildRequires: isorelax -BuildRequires: java-devel >= 1.7 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: jaxen -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 -BuildRequires: xml-apis BuildArch: noarch %description @@ -60,40 +49,31 @@ Group: Documentation/HTML This package contains javadoc for %{name}. %prep -%setup -q -n jdom-JDOM-%{version} -rm -r lib */lib -find -name '*.jar' -delete -find -name '*.class' -delete +%setup -q -n jdom-%{version} %patch0 -p1 -cp -p %{SOURCE1} maven/contrib.pom -cp -p %{SOURCE2} maven/junit.pom - sed -i 's/\r//' LICENSE.txt # Unable to run coverage: use log4j12 but switch to log4j 2.x sed -i.coverage "s|coverage, jars|jars|" build.xml +# XPath functionality is not needed +rm -rf core/src/java/org/jdom2/xpath/ +sed -i '/import org.jdom2.xpath.XPathFactory/d' core/src/java/org/jdom2/JDOMConstants.java + %build -mkdir lib -build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer -%{ant} -Dversion=%{version} -Dcompile.target=7 -Dcompile.source=7 -Dj2se.apidoc=%{_javadocdir}/java maven +mkdir -p lib +%{ant} -Dversion=%{version} -Dcompile.target=8 -Dcompile.source=8 -Dj2se.apidoc=%{_javadocdir}/java maven %install # jar install -dm 0755 %{buildroot}%{_javadir}/%{name} install -pm 0644 build/package/jdom-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar -install -pm 0644 build/package/jdom-%{version}-contrib.jar %{buildroot}%{_javadir}/%{name}/%{name}-contrib.jar -install -pm 0644 build/package/jdom-%{version}-junit.jar %{buildroot}%{_javadir}/%{name}/%{name}-junit.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -pm 0644 build/maven/core/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -install -pm 0644 build/maven/core/%{name}-%{version}-contrib.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-contrib.pom -%add_maven_depmap %{name}/%{name}-contrib.pom %{name}/%{name}-contrib.jar -install -pm 0644 build/maven/core/%{name}-%{version}-junit.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-junit.pom -%add_maven_depmap %{name}/%{name}-junit.pom %{name}/%{name}-junit.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr build/apidocs/* %{buildroot}%{_javadocdir}/%{name}/