From 9c37da507f68b619215385b12275b51261f7dad04bb765b0f9fb29d9044b01e4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Feb 2019 06:47:27 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=40 --- apache-commons-logging.changes | 5 +++++ apache-commons-logging.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index 29f1579..e6a06ff 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 6 06:47:05 UTC 2019 - Fridrich Strba + +- Build against glassfish-servlet-api + ------------------------------------------------------------------- Mon Jan 28 12:43:50 UTC 2019 - Fridrich Strba diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index a02a896..08b4582 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -37,12 +37,11 @@ Patch2: commons-logging-manifests.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: apache-commons-parent +BuildRequires: glassfish-servlet-api BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: log4j-mini >= 1.2 -BuildRequires: servletapi5 Requires: java >= 1.8 Requires: mvn(org.apache.commons:commons-parent:pom:) Provides: jakarta-%{short_name} = %{version}-%{release} @@ -81,8 +80,10 @@ export CLASSPATH=$(build-classpath \ plexus/ \ junit \ ):target/classes:target/test-classes -ant -Dmaven.mode.offline=true -Dlog4j12.jar=%{_javadir}/log4j.jar dist \ - -lib %{_javadir} +ant \ + -Dmaven.mode.offline=true -lib %{_javadir} \ + -Dlog4j12.jar=%{_javadir}/log4j.jar -Dservletapi.jar=%{_javadir}/glassfish-servlet-api.jar \ + dist %install # jars