From 272e21279f2823803feece9fe698ff8ea3725477b5e27ca2e47bce89d84b2e79 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 20 Jun 2012 07:16:49 +0000 Subject: [PATCH] - add pom - build against tomcat-servlet-3_0-api - fix a build with jdk7 OBS-URL: https://build.opensuse.org/package/show/Java:packages/avalon-logkit?expand=0&rev=9 --- avalon-logkit.changes | 5 +++++ avalon-logkit.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/avalon-logkit.changes b/avalon-logkit.changes index d8d5ff9..7bbf4b8 100644 --- a/avalon-logkit.changes +++ b/avalon-logkit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 20 07:14:17 UTC 2012 - mvyskocil@suse.cz + +- bump servletapi to 30 (tomcat7) + ------------------------------------------------------------------- Fri May 18 08:18:05 UTC 2012 - mvyskocil@suse.cz diff --git a/avalon-logkit.spec b/avalon-logkit.spec index 1f04b24..550ab87 100644 --- a/avalon-logkit.spec +++ b/avalon-logkit.spec @@ -41,7 +41,7 @@ Patch3: fix-java7-compile.patch Requires: avalon-framework >= 4.1.4 #Requires: jdbc-stdext Requires: jms -Requires: servlet25 +Requires: servlet30 BuildRequires: ant BuildRequires: ant-junit @@ -51,7 +51,7 @@ BuildRequires: jdbc-stdext BuildRequires: jms BuildRequires: jpackage-utils >= 1.5 BuildRequires: log4j -BuildRequires: servlet25 +BuildRequires: servlet30 BuildRequires: unzip BuildArch: noarch @@ -86,11 +86,12 @@ export CLASSPATH=%(build-classpath \ log4j \ javamail/mailapi \ jms_api \ - tomcat6-servlet-2.5-api \ + tomcat-servlet-api \ jdbc-stdext \ avalon-framework \ junit \ ):$PWD/build/classes + ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \ -lib /usr/share/java # Convert to OSGi bundle