- Update to 5.1.15, fix BZ#676464, changed BR: log4j to BR: slf4j
This commit is contained in:
parent
a0d14118e4
commit
5799ee1360
3 changed files with 11 additions and 8 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1,3 @@
|
|||
mysql-connector-java-5.1.12.tar.xz
|
||||
/mysql-connector-java-5.1.14.tar.xz
|
||||
/mysql-connector-java-5.1.15.tar.gz
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
Summary: Official JDBC driver for MySQL
|
||||
Name: mysql-connector-java
|
||||
Version: 5.1.14
|
||||
Release: 2%{?dist}
|
||||
Version: 5.1.15
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
|
||||
# MySQL FLOSS Exception
|
||||
|
|
@ -24,10 +24,9 @@ URL: http://dev.mysql.com/downloads/connector/j/
|
|||
#
|
||||
# %{name}-%{version}-bin.jar
|
||||
# src/lib/ant-contrib.jar
|
||||
# src/lib/c3p0-LICENSE
|
||||
# src/lib/c3p0-0.9.1-pre6.jar
|
||||
# src/lib/jboss-common-jdbc-wrapper.jar
|
||||
# src/lib/jboss-lgpl.txt
|
||||
# src/lib/slf4j-api-1.6.1.jar
|
||||
#
|
||||
# See http://bugs.mysql.com/bug.php?id=28512 for details.
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
|
|
@ -42,14 +41,14 @@ BuildRequires: java-devel >= 1.4.2
|
|||
Requires: java >= 1.4.2
|
||||
%endif
|
||||
Requires: jta >= 1.0
|
||||
Requires: log4j
|
||||
Requires: slf4j
|
||||
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: slf4j
|
||||
BuildRequires: java-1.6.0-openjdk-devel
|
||||
BuildRequires: java-1.5.0-gcj-devel
|
||||
BuildRequires: jakarta-commons-logging
|
||||
|
|
@ -79,7 +78,7 @@ sed -i 's/\r//' docs/README.txt
|
|||
%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 jdbc-stdext jta junit log4j commons-logging.jar)
|
||||
export CLASSPATH=$(build-classpath jdbc-stdext jta junit slf4j 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).
|
||||
|
|
@ -146,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Feb 10 2011 Miloš Jakubíček <xjakub@fi.muni.cz> - 1:5.1.15-1
|
||||
- Update to 5.1.15, fix BZ#676464, changed BR: log4j to BR: slf4j
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:5.1.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
84140384120c0ade054184a82ac95e06 mysql-connector-java-5.1.14.tar.xz
|
||||
5e8ab4a9131be586a28acdbea87118dd mysql-connector-java-5.1.15.tar.gz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue