From 4f1b4e4eb79f89ab8d73e33e3dc9c06fdbe519b2b8cd55c7bd74b02908230de1 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 28 Feb 2012 14:15:09 +0000 Subject: [PATCH] - ignore mysql-connector-java from build to break a build cycle OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=12 --- bsf.changes | 5 +++++ bsf.spec | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bsf.changes b/bsf.changes index 128ad8c..e6e8127 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 28 14:14:36 UTC 2012 - mvyskocil@suse.cz + +- ignore mysql-connector-java from build to break a build cycle + ------------------------------------------------------------------- Sat Sep 17 20:56:11 UTC 2011 - jengelh@medozas.de diff --git a/bsf.spec b/bsf.spec index a7fc182..bf2d821 100644 --- a/bsf.spec +++ b/bsf.spec @@ -1,7 +1,7 @@ # # spec file for package bsf # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,9 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # icecream 0 + %define name bsf %define version 2.3.0 %define release 8jpp @@ -26,15 +26,16 @@ Name: bsf BuildRequires: ant BuildRequires: java-devel BuildRequires: jython +#!BuildIgnore: mysql-connector-java BuildRequires: servletapi4 BuildRequires: xalan-j2 BuildRequires: xml-commons-apis Version: 2.3.0 -Release: 324 +Release: 0 Summary: Bean Scripting Framework -License: Apache Software License .. -Url: http://jakarta.apache.org/bsf/ +License: Apache-2.0 Group: Development/Libraries/Java +Url: http://jakarta.apache.org/bsf/ Source0: http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.bz2 Source1: bsf-component-info.xml Source2: bsf-2.3.0.pom @@ -71,7 +72,6 @@ In addition, the following languages are supported with their own %package javadoc -License: Apache Software License .. PreReq: coreutils Summary: Javadoc for bsf Group: Development/Libraries/Java