rpms/mysql-connector-java/devel mysql-connector-java.spec,1.11,1.12
Tom Lane
tgl at fedoraproject.org
Thu Jan 21 20:46:52 UTC 2010
Author: tgl
Update of /cvs/pkgs/rpms/mysql-connector-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25947
Modified Files:
mysql-connector-java.spec
Log Message:
Clean up rpmlint complaints
Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/devel/mysql-connector-java.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mysql-connector-java.spec 4 Dec 2009 16:44:20 -0000 1.11
+++ mysql-connector-java.spec 21 Jan 2010 20:46:52 -0000 1.12
@@ -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
-
-Summary: Official JDBC driver for MySQL
-Name: mysql-connector-java
-Version: 5.1.8
-Release: 2%{?dist}
-Epoch: 1
+%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: 3%{?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.gz
-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).
@@ -158,6 +156,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Jan 21 2010 Tom Lane <tgl at 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 +289,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
-
More information about the scm-commits
mailing list