From 77aaee986568a5c09f889588e04d423df75e3415c07f5a1e1727efcea1b7dbab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 27 Jun 2014 12:34:22 +0000
Subject: [PATCH] - Cleanup with spec-cleaner - Try to build on SLE_11

OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=17
---
 mysql-connector-java.changes |  6 ++++++
 mysql-connector-java.spec    | 26 +++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes
index 08ef62b..f8465f7 100644
--- a/mysql-connector-java.changes
+++ b/mysql-connector-java.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 27 12:33:20 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner
+- Try to build on SLE_11
+
 -------------------------------------------------------------------
 Thu Sep 19 14:12:57 UTC 2013 - mvyskocil@suse.com
 
diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index 9c8d56a..00116e2 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mysql-connector-java
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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,7 +14,6 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
 Name:           mysql-connector-java
@@ -24,7 +23,6 @@ Summary:        Official JDBC Driver for MySQL
 License:        GPL-2.0+
 Group:          Development/Libraries/Java
 Url:            http://www.mysql.com/downloads/api-jdbc-stable.html
-
 # url-for-download: http://dev.mysql.com/get/Downloads/Connector-J/%{name}-%{version}.zip/from/pick#mirrors
 # docs are now under very strict proprietary license by Oracle, so lets not distribute them
 # remove bundled jars as well
@@ -35,33 +33,29 @@ Url:            http://www.mysql.com/downloads/api-jdbc-stable.html
 Source0:        %{name}-%{version}-suse.tar.xz
 # Patch to build Java 7/jdbc 4.1
 Patch0:         mysql-connector-java-7-jdbc-4.1.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-
 BuildRequires:  ant
 BuildRequires:  ant-contrib
 BuildRequires:  apache-commons-logging
-#BuildRequires:  java-1_5_0-gcj-compat-devel
-BuildRequires:  java-devel >= 1.6.0
 #BuildRequires:  jta >= 1.0
 BuildRequires:  geronimo-jta-1_1-api
+#BuildRequires:  java-1_5_0-gcj-compat-devel
+BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
-BuildRequires:  slf4j
 #!BuildIgnore:  maven2-bootstrap
 BuildRequires:  log4j-mini
-
+BuildRequires:  slf4j
+BuildRequires:  xz
 Requires:       jta >= 1.0
 Requires:       log4j
 Requires:       slf4j
-
 Provides:       mm.mysql = %{version}
 Obsoletes:      mm.mysql < %{version}
-
 # manual is no longer distributed
 Provides:       %{name}-manual = %{version}
 Obsoletes:      %{name}-manual < %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 MySQL Connector/J is a native Java driver that converts JDBC (Java
@@ -73,7 +67,7 @@ Connector/J is a Type IV JDBC driver and has a complete JDBC feature
 set that supports the capabilities of MySQL.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
 
 # dup
@@ -102,7 +96,9 @@ export CLASSPATH=$(build-classpath \
 # we need jdk5 for jdbc3.0
 # XXX: JAVA_HOME must be setup **after** CLASSPATH
 #export JAVA_HOME=%{_libdir}/jvm/java-1.5.0-gcj
-ant -DbuildDir=build-mysql-jdbc \
+ant \
+    -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+    -DbuildDir=build-mysql-jdbc \
     -DdistDir=dist-mysql-jdbc \
     -Dcom.mysql.jdbc.java6.javac="%{javac}" \
     -Dcom.mysql.jdbc.java6.java="%{java}" \