Hello community,
here is the log from the commit of package mysql-connector-java for
openSUSE:Factory checked in at 2014-06-30 22:50:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-java (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-java.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-java"
Changes:
--------
---
/work/SRC/openSUSE:Factory/mysql-connector-java/mysql-connector-java.changes
2013-09-23 15:25:34.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-java.new/mysql-connector-java.changes
2014-06-30 22:50:11.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 27 12:33:20 UTC 2014 - tchva...@suse.com
+
+- Cleanup with spec-cleaner
+- Try to build on SLE_11
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-java.spec ++++++
--- /var/tmp/diff_new_pack.o4HQRm/_old 2014-06-30 22:50:13.000000000 +0200
+++ /var/tmp/diff_new_pack.o4HQRm/_new 2014-06-30 22:50:13.000000000 +0200
@@ -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 @@
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 @@
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 @@
set that supports the capabilities of MySQL.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q
%patch0 -p1
# dup
@@ -102,7 +96,9 @@
# 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}" \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
