- sync with devel: update to 5.1.11, specfile cleanup
This commit is contained in:
Miloš Jakubíček
parent
759828d3ac
commit
b60877952a
2 changed files with 44 additions and 40 deletions
|
|
@ -1,19 +1,21 @@
|
|||
%global builddir build-mysql-jdbc
|
||||
%global distdir dist-mysql-jdbc
|
||||
%global gcj_support 1
|
||||
%global java6_rtpath /usr/lib/jvm/java-1.6.0/jre/lib/rt.jar
|
||||
%global java6_javacpath /usr/lib/jvm/java-1.6.0/bin/javac
|
||||
%global java6_javapath /usr/lib/jvm/java-1.6.0/bin/javac
|
||||
%global builddir build-mysql-jdbc
|
||||
%global distdir dist-mysql-jdbc
|
||||
%global gcj_support 1
|
||||
%global java6_rtpath %{java_home}/jre/lib/rt.jar
|
||||
%global java6_javacpath /usr/bin/javac
|
||||
%global java6_javapath /usr/bin/javac
|
||||
|
||||
Summary: Official JDBC driver for MySQL
|
||||
Name: mysql-connector-java
|
||||
Version: 5.1.8
|
||||
Release: 2%{?dist}
|
||||
Epoch: 1
|
||||
Summary: Official JDBC driver for MySQL
|
||||
Name: mysql-connector-java
|
||||
Version: 5.1.11
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
|
||||
# MySQL FLOSS Exception
|
||||
License: GPLv2 with exceptions
|
||||
Group: System Environment/Libraries
|
||||
License: GPLv2 with exceptions
|
||||
Group: System Environment/Libraries
|
||||
URL: http://dev.mysql.com/downloads/connector/j/
|
||||
|
||||
# Mysql has a mirror redirector for its downloads
|
||||
# You can get this tarball by following a link from:
|
||||
# http://dev.mysql.com/get/Downloads/Connector-J/%{name}-%{version}.tar.gz/from/pick#mirrors
|
||||
|
|
@ -35,38 +37,34 @@ Group: System Environment/Libraries
|
|||
# src/lib/log4j-1.2.9.jar
|
||||
#
|
||||
# See http://bugs.mysql.com/bug.php?id=28512 for details.
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
URL: http://dev.mysql.com/downloads/connector/j/5.1.html
|
||||
BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
%if %{gcj_support}
|
||||
BuildRequires: java-gcj-compat-devel >= 1.0.31
|
||||
Requires(post): java-gcj-compat >= 1.0.31
|
||||
Requires(postun): java-gcj-compat >= 1.0.31
|
||||
BuildRequires: java-gcj-compat-devel >= 1.0.31
|
||||
Requires(post): java-gcj-compat >= 1.0.31
|
||||
Requires(postun): java-gcj-compat >= 1.0.31
|
||||
%else
|
||||
BuildRequires: java-devel >= 1.4.2
|
||||
Requires: java >= 1.4.2
|
||||
BuildRequires: java-devel >= 1.4.2
|
||||
Requires: java >= 1.4.2
|
||||
%endif
|
||||
Requires: jta >= 1.0
|
||||
Requires: log4j
|
||||
BuildRequires: ant >= 1.6.0
|
||||
BuildRequires: ant-contrib >= 1.0
|
||||
BuildRequires: java-devel >= 1.4.0
|
||||
BuildRequires: jpackage-utils >= 1.6
|
||||
BuildRequires: jta >= 1.0
|
||||
BuildRequires: junit
|
||||
BuildRequires: log4j
|
||||
BuildRequires: java-1.6.0-openjdk-devel
|
||||
BuildRequires: java-1.5.0-gcj-devel
|
||||
BuildRequires: jakarta-commons-logging
|
||||
Requires: jta >= 1.0
|
||||
Requires: log4j
|
||||
BuildRequires: ant >= 1.6.0
|
||||
BuildRequires: ant-contrib >= 1.0
|
||||
BuildRequires: java-devel >= 1.4.0
|
||||
BuildRequires: jpackage-utils >= 1.6
|
||||
BuildRequires: jta >= 1.0
|
||||
BuildRequires: junit
|
||||
BuildRequires: log4j
|
||||
BuildRequires: java-1.6.0-openjdk-devel
|
||||
BuildRequires: java-1.5.0-gcj-devel
|
||||
BuildRequires: jakarta-commons-logging
|
||||
|
||||
Requires: jpackage-utils
|
||||
Requires(post): jpackage-utils
|
||||
Requires(postun): jpackage-utils
|
||||
|
||||
Provides: mm.mysql
|
||||
Obsoletes: mm.mysql
|
||||
|
||||
%description
|
||||
MySQL Connector/J is a native Java driver that converts JDBC (Java Database
|
||||
Connectivity) calls into the network protocol used by the MySQL database.
|
||||
|
|
@ -92,7 +90,7 @@ sed -i 's/\r//' EXCEPTIONS-CONNECTOR-J
|
|||
%build
|
||||
|
||||
# We need both JDK1.5 (for JDBC3.0; appointed by $JAVA_HOME) and JDK1.6 (for JDBC4.0; appointed in the build.xml)
|
||||
export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j commons-logging.jar)
|
||||
export CLASSPATH=$(build-classpath jdbc-stdext jta junit log4j commons-logging.jar)
|
||||
export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj
|
||||
|
||||
# We currently need to disable jboss integration because of missing jboss-common-jdbc-wrapper.jar (built from sources).
|
||||
|
|
@ -152,12 +150,19 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README docs
|
||||
%attr(0644,root,root) %{_javadir}/*.jar
|
||||
%config(noreplace) %{_mavendepmapfragdir}/*
|
||||
%{_datadir}/maven2/poms/*.pom
|
||||
%{_mavenpomdir}/*.pom
|
||||
%if %{gcj_support}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jan 29 2010 Milos Jakubicek <xjakub@fi.muni.cz> 1:5.1.11-1
|
||||
- Update to 5.1.11
|
||||
|
||||
* Thu Jan 21 2010 Tom Lane <tgl@redhat.com> 1:5.1.8-3
|
||||
- Clean up rpmlint complaints (/usr/lib/ references, old provides/obsoletes,
|
||||
tab usage)
|
||||
|
||||
* Fri Dec 4 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:5.1.8-2
|
||||
- Add Maven POM and depmap fragment
|
||||
|
||||
|
|
@ -287,4 +292,3 @@ to sun classes
|
|||
also build MysqlDataSource and MysqlDataSourceFactory
|
||||
- build with IBM JDK 1.3.0 (cx130-20001114) and jikes 1.12
|
||||
- build CLASSPATH=/usr/share/java/jdbc2_0-stdext.jar
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
815783766d36eb650be60718cc0be84c mysql-connector-java-5.1.8.tar.gz
|
||||
2e80ceda60d240ea972b025d51102c08 mysql-connector-java-5.1.11.tar.xz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue