From dc7ec92e7245d42497a0fa77de000d697ba2a88bd391999392afec2bba4e5785 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 28 Feb 2012 13:52:06 +0000 Subject: [PATCH] - fix build cycle, do not require avalon-* for build and use servletapi5 instead of tomcat6 package OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=5 --- apache-commons-logging.changes | 6 ++++++ apache-commons-logging.spec | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index e06bb5d..71d4f38 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 28 13:50:53 UTC 2012 - mvyskocil@suse.cz + +- fix build cycle, do not require avalon-* for build and use servletapi5 + instead of tomcat6 package + ------------------------------------------------------------------- Wed Feb 8 14:16:04 UTC 2012 - mvyskocil@suse.cz diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index a52adbf..58ef8e5 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -39,8 +39,6 @@ Patch2: build.xml.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: apache-commons-parent -BuildRequires: avalon-framework -BuildRequires: avalon-logkit BuildRequires: java-devel >= 1.6.0 BuildRequires: jpackage-utils >= 1.6 BuildRequires: junit @@ -48,7 +46,7 @@ BuildRequires: junit BuildRequires: maven-plugin-build-helper BuildRequires: maven-site-plugin %endif -BuildRequires: servlet25 +BuildRequires: servletapi5 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build