diff --git a/.gitignore b/.gitignore index e69de29..3aa89c4 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,3 @@ +/JDOM-2.0.5.tar.gz +/JDOM-2.0.6.tar.gz +/jdom2-2.0.6.tar.gz diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch new file mode 100644 index 0000000..87e9f3b --- /dev/null +++ b/0001-Adapt-build.patch @@ -0,0 +1,101 @@ +From 05a8a2fa49e92ad36a86d5d73588a2e46bf9ff95 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 23 Jul 2018 14:30:14 +0200 +Subject: [PATCH] Adapt build + +--- + build.xml | 40 +++++++++++++++++++++++++--------------- + 1 file changed, 25 insertions(+), 15 deletions(-) + +diff --git a/build.xml b/build.xml +index cd7c2ed..10d8df6 100644 +--- a/build.xml ++++ b/build.xml +@@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file. + + + +- +- +- +- +- +- +- +- +- +- +- ++ + + + +@@ -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."> + ++ + + + +@@ -373,11 +364,11 @@ For instructions on how to build JDOM, please view the README.txt file. + + +- ++ + + + +@@ -401,6 +392,7 @@ For instructions on how to build JDOM, please view the README.txt file. + + + ++ + + + +@@ -528,7 +520,25 @@ For instructions on how to build JDOM, please view the README.txt file. + + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +- +- ++ ++ + + + diff --git a/bnd.properties b/bnd.properties new file mode 100644 index 0000000..904f2f7 --- /dev/null +++ b/bnd.properties @@ -0,0 +1,4 @@ +Bundle-Name=JDOM 2 +Bundle-SymbolicName=org.jdom2 +Export-Package=* +Import-Package=org.jaxen.*;resolution:=optional,* diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..b869a6b --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e + +name=jdom2 +version="$(sed -n 's/Version:\s*//p' *.spec)" + +# RETRIEVE +wget "https://github.com/hunterhacker/jdom/archive/JDOM-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +cd tarball-tmp +tar xf "../${name}-${version}.orig.tar.gz" + +# CLEAN TARBALL +rm -r */lib */*/lib +find -name '*.jar' -delete +find -name '*.class' -delete + +tar cf "../${name}-${version}.tar.gz" * +cd .. +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/jdom-contrib-template.pom b/jdom-contrib-template.pom new file mode 100644 index 0000000..d719410 --- /dev/null +++ b/jdom-contrib-template.pom @@ -0,0 +1,96 @@ + + 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 new file mode 100644 index 0000000..7bc62f9 --- /dev/null +++ b/jdom-junit-template.pom @@ -0,0 +1,120 @@ + + 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 + + + org.apache.logging.log4j + log4j-1.2-api + 2.13.3 + 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.spec b/jdom2.spec new file mode 100644 index 0000000..9cdb74b --- /dev/null +++ b/jdom2.spec @@ -0,0 +1,168 @@ +Name: jdom2 +Version: 2.0.6 +Release: 20%{?dist} +Summary: Java manipulation of XML made easy +License: Saxpath +URL: http://www.jdom.org/ +# ./generate-tarball.sh +Source0: %{name}-%{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 +# Bnd tool configuration +Source3: bnd.properties +# Remove bundled jars that might not have clear licensing +Source4: generate-tarball.sh +# Use system libraries +# Disable gpg signatures +# Process contrib and junit pom files +Patch0: 0001-Adapt-build.patch +Patch1: 0002-More-adapt-build-javac-1.8.patch + +BuildRequires: javapackages-local +BuildRequires: ant +BuildRequires: ant-junit +BuildRequires: jaxen +BuildRequires: xalan-j2 +BuildRequires: xerces-j2 +BuildRequires: xml-commons-apis +BuildRequires: aqute-bnd + +BuildArch: noarch + +%description +JDOM is a Java-oriented object model which models XML documents. +It provides a Java-centric means of generating and manipulating +XML documents. While JDOM inter-operates well with existing +standards such as the Simple API for XML (SAX) and the Document +Object Model (DOM), it is not an abstraction layer or +enhancement to those APIs. Rather, it seeks to provide a robust, +light-weight means of reading and writing XML data without the +complex and memory-consumptive options that current API +offerings provide. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q -n jdom-JDOM-%{version} + +%patch0 -p1 +%patch1 -p1 + +cp -p %{SOURCE1} maven/contrib.pom +cp -p %{SOURCE2} maven/junit.pom + +sed -i 's/\r//' LICENSE.txt README.txt + +# Unable to run coverage: use log4j12 but switch to log4j 2.x +sed -i.coverage "s|coverage, jars|jars|" build.xml + +mkdir lib +build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit xalan-j2 xalan-j2-serializer + +# drop optional isorelax verifier support from contrib +rm -r contrib/src/java/org/jdom2/contrib/schema + +%build +ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven + +# Make jar into an OSGi bundle +bnd wrap --output build/package/jdom-%{version}.bar --properties %{SOURCE3} \ + --version %{version} build/package/jdom-%{version}.jar +mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar + +%install +%mvn_artifact build/maven/core/%{name}-%{version}.pom build/package/jdom-%{version}.jar +%mvn_artifact build/maven/core/%{name}-%{version}-contrib.pom build/package/jdom-%{version}-contrib.jar +%mvn_artifact build/maven/core/%{name}-%{version}-junit.pom build/package/jdom-%{version}-junit.jar +%mvn_install -J build/apidocs + +%files -f .mfiles +%doc CHANGES.txt COMMITTERS.txt README.txt TODO.txt +%license LICENSE.txt + +%files javadoc -f .mfiles-javadoc +%license LICENSE.txt + +%changelog +* Thu Sep 10 2020 Fabio Valentini - 2.0.6-20 +- Drop log4j12 dependency and switch junit module to log4j 1.2 API shim. + +* Tue Jul 28 2020 Fedora Release Engineering - 2.0.6-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jul 19 2020 Fabio Valentini - 2.0.6-18 +- Set javac source and target to 1.8 to fix Java 11 builds. + +* Fri Jul 10 2020 Jiri Vanek - 2.0.6-17 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu May 07 2020 Fabio Valentini - 2.0.6-16 +- Drop optional isorelax verifier support from contrib. + +* Wed Jan 29 2020 Fedora Release Engineering - 2.0.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.0.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 2.0.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jul 23 2018 Michael Simacek - 2.0.6-12 +- Repack tarball without bundled jars +- The repacked jar contains slightly different source (force push by upstream?) +- Correct license tag + +* Tue Jul 17 2018 Mikolaj Izdebski - 2.0.6-11 +- Remove unneeded buildrequires + +* Fri Jul 13 2018 Fedora Release Engineering - 2.0.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed May 31 2017 Michael Simacek - 2.0.6-7 +- Avoid hardcoded jar paths + +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Apr 14 2016 Mat Booth - 2.0.6-6 +- Add OSGi metadata to main jar +- Fix file listed twice warning + +* Thu Feb 04 2016 Fedora Release Engineering - 2.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 2.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Mar 24 2015 Mikolaj Izdebski - 2.0.6-3 +- Remove unneeded BR on cobertura + +* Fri Feb 06 2015 gil cattaneo 2.0.6-2 +- introduce license macro + +* Tue Oct 21 2014 gil cattaneo 2.0.6-1 +- update to 2.0.6 (rhbz#1118627) + +* Sun Jun 08 2014 Fedora Release Engineering - 2.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Mar 28 2014 Michael Simacek - 2.0.5-3 +- Use Requires: java-headless rebuild (#1067528) + +* Thu Nov 14 2013 gil cattaneo 2.0.5-2 +- use objectweb-asm3 + +* Thu Sep 12 2013 gil cattaneo 2.0.5-1 +- initial rpm diff --git a/sources b/sources new file mode 100644 index 0000000..0850013 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (jdom2-2.0.6.tar.gz) = 1a38c882323339e94c36635e80635ecf8f66e4a1ed0228f68c11098b1282bd9043fdfec1b31196b79eea72495440ac175af50a0556439be5ba956238c32dd1ff