This commit is contained in:
parent
73083c9eac
commit
9f47b57c88
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 15 10:41:03 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 14 11:39:40 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package apache-commons-io
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -29,11 +29,13 @@ Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{sho
|
||||
#PATCH-FIX-OPENSUSE: fix the version property to 2.4
|
||||
Patch0: commons-io-version-property.patch
|
||||
BuildRequires: ant >= 1.6
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-tools
|
||||
Provides: %{short_name} = %{version}-%{release}
|
||||
Provides: jakarta-%{short_name} = %{version}-%{release}
|
||||
Obsoletes: jakarta-%{short_name} <= %{version}
|
||||
Obsoletes: jakarta-%{short_name} < %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
@ -59,7 +61,7 @@ sed -i -e 's/.$//' *.txt
|
||||
export OPT_JAR_LIST="junit"
|
||||
export CLASSPATH=
|
||||
CLASSPATH=target/classes:target/test-classes:$CLASSPATH
|
||||
ant -Dcompile.source=1.6 -Dcompile.target=1.6 \
|
||||
ant -Dcompile.source=8 -Dcompile.target=8 \
|
||||
-Dbuild.sysclasspath=only \
|
||||
dist
|
||||
|
||||
@ -79,6 +81,7 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
|
||||
# javadoc
|
||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
|
Loading…
Reference in New Issue
Block a user