Compare commits

...

No commits in common. "c8-stream-201902" and "stream-javapackages-tools-201801-rhel-8.9.0" have entirely different histories.

9 changed files with 13 additions and 16 deletions

4
.gitignore vendored
View File

@ -1 +1,3 @@
SOURCES/jdom2-2.0.6.tar.gz
/JDOM-2.0.5.tar.gz
/JDOM-2.0.6.tar.gz
/jdom2-2.0.6.tar.gz

View File

@ -1 +1 @@
d47a717b9ea4e9917652d4b80a669b5f55fe7639 SOURCES/jdom2-2.0.6.tar.gz
d47a717b9ea4e9917652d4b80a669b5f55fe7639 jdom2-2.0.6.tar.gz

View File

@ -1,6 +1,6 @@
Name: jdom2
Version: 2.0.6
Release: 14%{?dist}
Release: 12%{?dist}
Summary: Java manipulation of XML made easy
License: Saxpath
URL: http://www.jdom.org/
@ -27,7 +27,7 @@ BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
BuildRequires: log4j12
#BuildRequires: aqute-bnd
BuildRequires: aqute-bnd
BuildArch: noarch
@ -61,16 +61,16 @@ 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
%build
mkdir lib
build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer
ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven
%build
ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven
# Make jar into an OSGi bundle
# XXX disabled until BND is fixed
#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
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
@ -86,12 +86,6 @@ ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc
%license LICENSE.txt
%changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-14
- Mass rebuild for javapackages-tools 201902
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-13
- Mass rebuild for javapackages-tools 201901
* Mon Jul 23 2018 Michael Simacek <msimacek@redhat.com> - 2.0.6-12
- Repack tarball without bundled jars
- The repacked jar contains slightly different source (force push by upstream?)

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (jdom2-2.0.6.tar.gz) = 1a38c882323339e94c36635e80635ecf8f66e4a1ed0228f68c11098b1282bd9043fdfec1b31196b79eea72495440ac175af50a0556439be5ba956238c32dd1ff