rpm/adaptx
SHA256
1
0
Fork 0
forked from pool/adaptx
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/adaptx?expand=0&rev=28

Browse Source
This commit is contained in:
Fridrich Strba 2019-10-01 10:07:01 +00:00 committed by Git OBS Bridge
parent dbe5e2b9a2
commit 79a3d4a4bf
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
adaptx.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 1 10:06:34 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Build against the new compatibility log4j12-mini package
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 6 15:27:33 UTC 2018 - Fridrich Strba <fstrba@suse.com> Thu Dec 6 15:27:33 UTC 2018 - Fridrich Strba <fstrba@suse.com>

8
adaptx.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package adaptx # spec file for package adaptx
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -30,10 +30,10 @@ Patch1: %{name}-%{version}-icedtea-build.patch
BuildRequires: ant >= 1.6 BuildRequires: ant >= 1.6
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: log4j BuildRequires: log4j12
BuildRequires: xerces-j2 BuildRequires: xerces-j2
BuildRequires: xml-apis BuildRequires: xml-apis
Requires: log4j Requires: log4j12
Requires: xerces-j2 Requires: xerces-j2
Requires: xml-apis Requires: xml-apis
BuildArch: noarch BuildArch: noarch
@ -68,7 +68,7 @@ done
%build %build
perl -p -i -e 's|classic|modern|' src/build.xml perl -p -i -e 's|classic|modern|' src/build.xml
export CLASSPATH=$(build-classpath xml-apis log4j xerces-j2) export CLASSPATH=$(build-classpath xml-apis log4j12/log4j-12 xerces-j2)
ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 -buildfile src/build.xml jar javadoc ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 -buildfile src/build.xml jar javadoc
CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar
ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 -buildfile src/build.xml doc ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 -buildfile src/build.xml doc