diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index 3cc0cb7..148d4c7 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com + +- Modified patch: + * commons-logging-1.2-sourcetarget.patch + + Build with source and target 8 to prepare for a possible + removal of 1.6 compatibility + ------------------------------------------------------------------- Thu Sep 7 12:07:36 UTC 2017 - fstrba@suse.com diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 0044af3..598081c 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-logging # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2007, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -35,13 +35,13 @@ Patch1: commons-logging-1.2-sourcetarget.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: apache-commons-parent -BuildRequires: java-devel >= 1.6.0 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: log4j-mini >= 1.2 BuildRequires: servletapi5 -Requires: java >= 1.6.0 +Requires: java >= 1.8 Provides: jakarta-%{short_name} = %{version}-%{release} Obsoletes: jakarta-%{short_name} < %{version} Provides: %{short_name} = %{version}-%{release} diff --git a/commons-logging-1.2-sourcetarget.patch b/commons-logging-1.2-sourcetarget.patch index 128eef8..1761f82 100644 --- a/commons-logging-1.2-sourcetarget.patch +++ b/commons-logging-1.2-sourcetarget.patch @@ -5,11 +5,11 @@ - -+ ++ - -+ ++