From 38a7b79f005ec52c867969c22881f4e8055cbd89 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:34:30 +0000 Subject: [PATCH 1/6] Initialize branch F-12 for mysql-connector-java --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 0eb913cb4e29029f4ea6936aefe84af03d297502 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:41:56 +0000 Subject: [PATCH 2/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e2f8350..273a611 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: mysql-connector-java -# $Id$ +# $Id: Makefile,v 1.1 2006/09/08 21:25:23 ifoox Exp $ NAME := mysql-connector-java SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 759828d3ac6db29c3be19a0649b54f546e5eddf7 Mon Sep 17 00:00:00 2001 From: mef Date: Fri, 4 Dec 2009 16:44:20 +0000 Subject: [PATCH 3/6] Add Maven POM and metadata --- mysql-connector-java.spec | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 45fb9e0..74b7b30 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -8,7 +8,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 5.1.8 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 # MySQL FLOSS Exception @@ -59,6 +59,11 @@ 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 @@ -99,7 +104,6 @@ rm src/testsuite/simple/ReadOnlyCallableStatementTest.java ant -DbuildDir=%{builddir} -DdistDir=%{distdir} -Dcom.mysql.jdbc.java6.rtjar=%{java6_rtpath} -Dcom.mysql.jdbc.java6.javac=%{java6_javacpath} -Dcom.mysql.jdbc.java6.java=%{java6_javapath} - %install rm -rf $RPM_BUILD_ROOT @@ -114,21 +118,30 @@ install -m 644 %{builddir}/%{name}-%{version}/%{name}-%{version}-bin.jar \ %{_bindir}/aot-compile-rpm %endif +# Install the Maven build information +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -pm 644 src/doc/sources/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom +sed -i 's/>@.*%{version} - 1:5.1.8-2 +- Add Maven POM and depmap fragment + * Tue Aug 26 2009 Milos Jakubicek - 1:5.1.8-1 - Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled. - Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging From b60877952a4dea9375970128977cbf96b8f682bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Jakub=C3=AD=C4=8Dek?= Date: Fri, 29 Jan 2010 14:15:50 +0000 Subject: [PATCH 4/6] - sync with devel: update to 5.1.11, specfile cleanup --- mysql-connector-java.spec | 82 ++++++++++++++++++++------------------- sources | 2 +- 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 74b7b30..d4d5fd5 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -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 1:5.1.11-1 +- Update to 5.1.11 + +* Thu Jan 21 2010 Tom Lane 1:5.1.8-3 +- Clean up rpmlint complaints (/usr/lib/ references, old provides/obsoletes, + tab usage) + * Fri Dec 4 2009 Mary Ellen Foster - 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 - diff --git a/sources b/sources index c1c019e..b379b69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -815783766d36eb650be60718cc0be84c mysql-connector-java-5.1.8.tar.gz +2e80ceda60d240ea972b025d51102c08 mysql-connector-java-5.1.11.tar.xz From 40a62bd6470eb4781fb5c0fe40b3b94080c0a293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Jakub=C3=AD=C4=8Dek?= Date: Fri, 19 Feb 2010 14:01:19 +0000 Subject: [PATCH 5/6] - Update to 5.1.12 --- mysql-connector-java.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index d4d5fd5..af7c4d5 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -7,7 +7,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java -Version: 5.1.11 +Version: 5.1.12 Release: 1%{?dist} Epoch: 1 @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Feb 19 2010 Miloš Jakubíček - 1:5.1.12-1 +- Update to 5.1.12 + * Fri Jan 29 2010 Milos Jakubicek 1:5.1.11-1 - Update to 5.1.11 diff --git a/sources b/sources index b379b69..49b54d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e80ceda60d240ea972b025d51102c08 mysql-connector-java-5.1.11.tar.xz +72941cd4c75d0dc30c86c5b572d7b124 mysql-connector-java-5.1.12.tar.xz From 4f825d7c258b5f0a73cd9c7a48e30a1fbfd867d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:53:59 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 273a611..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mysql-connector-java -# $Id: Makefile,v 1.1 2006/09/08 21:25:23 ifoox Exp $ -NAME := mysql-connector-java -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12