This commit is contained in:
parent
faa4546c58
commit
9167f295b9
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 15 07:32:20 UTC 2018 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Build with source and target 8 to prepare for a possible removal
|
||||||
|
of 1.6 compatibility in OpenJDK 11
|
||||||
|
- Run fdupes on documentation
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Sep 29 08:11:16 UTC 2017 - fstrba@suse.com
|
Fri Sep 29 08:11:16 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package apache-commons-codec
|
# spec file for package apache-commons-codec
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2000-2010, JPackage Project
|
# Copyright (c) 2000-2010, JPackage Project
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
@ -32,13 +32,15 @@ Source4: MANIFEST.MF
|
|||||||
Patch0: timeout.patch
|
Patch0: timeout.patch
|
||||||
BuildRequires: ant >= 1.7
|
BuildRequires: ant >= 1.7
|
||||||
BuildRequires: ant-junit >= 1.7
|
BuildRequires: ant-junit >= 1.7
|
||||||
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: java-devel >= 1.8
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
# FIXME: mozilla-nss is necessary in order to use crypto, which is tested via junit tests
|
# FIXME: mozilla-nss is necessary in order to use crypto, which is tested via junit tests
|
||||||
# this should be a dependency of openjdk itself
|
# this should be a dependency of openjdk itself
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
BuildRequires: mozilla-nss
|
BuildRequires: mozilla-nss
|
||||||
Requires: java >= 1.6.0
|
Requires: java >= 1.8
|
||||||
Provides: jakarta-%{short_name} = %{version}
|
Provides: jakarta-%{short_name} = %{version}
|
||||||
Obsoletes: jakarta-%{short_name} < %{version}
|
Obsoletes: jakarta-%{short_name} < %{version}
|
||||||
Provides: %{short_name} = %{version}
|
Provides: %{short_name} = %{version}
|
||||||
@ -82,7 +84,8 @@ export MAVEN_OPTS="-Dmaven2.jpp.mode=true -Dmaven2.jpp.depmap.file=%{SOURCE2} -D
|
|||||||
|
|
||||||
export CLASSPATH=$(build-classpath junit)
|
export CLASSPATH=$(build-classpath junit)
|
||||||
ant -Dbuild.sysclasspath=first \
|
ant -Dbuild.sysclasspath=first \
|
||||||
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
|
-Dant.build.javac.source=8 -Dant.build.javac.target=8 \
|
||||||
|
-Dcompile.source=8 -Dcompile.target=8 \
|
||||||
-Dconf.home=src/conf \
|
-Dconf.home=src/conf \
|
||||||
-Dbuild.home=build \
|
-Dbuild.home=build \
|
||||||
-Dsource.home=src/main/java \
|
-Dsource.home=src/main/java \
|
||||||
@ -118,6 +121,7 @@ install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
|
|||||||
# javadoc
|
# javadoc
|
||||||
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
|
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||||
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
|
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||||
|
%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||||
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}-%{version}
|
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}-%{version}
|
||||||
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}
|
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}
|
||||||
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
|
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
Loading…
Reference in New Issue
Block a user