From 4f1b4e4eb79f89ab8d73e33e3dc9c06fdbe519b2b8cd55c7bd74b02908230de1 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Tue, 28 Feb 2012 14:15:09 +0000
Subject: [PATCH 1/2] - 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

From d36421867a89e2b4dce199a8d4b997e2c9da296b98ea9ed48eda5adef2330dfa Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Wed, 29 Feb 2012 10:08:46 +0000
Subject: [PATCH 2/2] osc

OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=13
---
 bsf-java14compat.patch | 75 ------------------------------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 bsf-java14compat.patch

diff --git a/bsf-java14compat.patch b/bsf-java14compat.patch
deleted file mode 100644
index 5ea4266..0000000
--- a/bsf-java14compat.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naur ../bsf-2.3.0.orig/src/bsf/build.xml ./src/bsf/build.xml
---- ../bsf-2.3.0.orig/src/bsf/build.xml	2002-11-13 07:28:54.000000000 +0100
-+++ ./src/bsf/build.xml	2006-09-25 14:25:56.000000000 +0200
-@@ -208,7 +208,8 @@
-       </fileset>
-     </copy>
- 
--    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}">
-+    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"
-+           source="1.4" target="1.4">
-       <patternset refid="javac.source.files"/>
-       <classpath location="${bsf.extraclasspath}"/>
-     </javac>
-@@ -250,19 +251,19 @@
-     <javac srcdir="${build.samples.calc}"
-            destdir="${build.samples.calc}"
-            classpath="${build.lib}/${name}.jar"
--           debug="${debug}"/>
-+           debug="${debug}" source="1.4" target="1.4"/>
-     <javac srcdir="${build.samples.jsplike}"
-            destdir="${build.samples.jsplike}"
-            classpath="${build.lib}/${name}.jar"
--           debug="${debug}"/>
-+           debug="${debug}" source="1.4" target="1.4"/>
-     <javac srcdir="${build.samples.scriptedui}"
-            destdir="${build.samples.scriptedui}"
-            classpath="${build.lib}/${name}.jar"
--           debug="${debug}"/>
-+           debug="${debug}" source="1.4" target="1.4"/>
-     <javac srcdir="${build.samples.xsl}"
-            destdir="${build.samples.xsl}"
-            classpath="${build.lib}/${name}.jar"
--           debug="${debug}"/>
-+           debug="${debug}" source="1.4" target="1.4"/>
-   </target>
- 
-   <!-- =================================================================== -->
-diff -Naur ../bsf-2.3.0.orig/src/bsf_debug/build.xml ./src/bsf_debug/build.xml
---- ../bsf-2.3.0.orig/src/bsf_debug/build.xml	2002-11-13 07:28:55.000000000 +0100
-+++ ./src/bsf_debug/build.xml	2006-09-25 14:27:22.000000000 +0200
-@@ -98,7 +98,8 @@
-       </fileset>
-     </copy>
- 
--    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"/>
-+    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"
-+           source="1.4" target="1.4"/>
- 
-     <!-- ================================================================= -->
-     <!-- Produces the jar file                                             -->
-diff -Naur ../bsf-2.3.0.orig/src/jsdb/build.xml ./src/jsdb/build.xml
---- ../bsf-2.3.0.orig/src/jsdb/build.xml	2002-11-13 07:28:54.000000000 +0100
-+++ ./src/jsdb/build.xml	2006-09-25 14:26:22.000000000 +0200
-@@ -99,7 +99,7 @@
-       </fileset>
-     </copy>
- 
--    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" classpath="${bsf_debug}/build/lib/bsf_debug.jar"/>
-+    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" classpath="${bsf_debug}/build/lib/bsf_debug.jar" source="1.4" target="1.4"/>
- 
-     <!-- ================================================================= -->
-     <!-- Produces the jar file                                             -->
-diff -Naur ../bsf-2.3.0.orig/src/taglib/build.xml ./src/taglib/build.xml
---- ../bsf-2.3.0.orig/src/taglib/build.xml	2002-11-13 07:28:53.000000000 +0100
-+++ ./src/taglib/build.xml	2006-09-25 14:26:53.000000000 +0200
-@@ -157,7 +157,8 @@
-   <target name="compile" depends="prepare">
-     <copy file="${conf.src}/taglib.tld"
-               tofile="${build.library}/META-INF/taglib.tld"/>
--    <javac srcdir="${library.src}" destdir="${build.library}" debug="on">
-+    <javac srcdir="${library.src}" destdir="${build.library}" debug="on"
-+           source="1.4" target="1.4">
-       <classpath> 
-       <pathelement location="${servlet.jar}"/>
-       <pathelement location="${taglib.extraclasspath}"/>