Accepting request 125494 from Java:packages

- bump servletapi to 30 (tomcat7)

OBS-URL: https://build.opensuse.org/request/show/125494
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avalon-logkit?expand=0&rev=4
This commit is contained in:
Stephan Kulow 2012-06-25 09:43:49 +00:00 committed by Git OBS Bridge
commit fdf8beb13c
2 changed files with 9 additions and 3 deletions

View File

@ -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

View File

@ -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