dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: mysql-connector-java
-# $Id$
-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
-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)

mysql-connector-java.spec

@@ -1,19 +1,21 @@
-%global		builddir		build-mysql-jdbc
+%global     builddir        build-mysql-jdbc
-%global		distdir			dist-mysql-jdbc
+%global     distdir         dist-mysql-jdbc
-%global		gcj_support		1
+%global     gcj_support     1
-%global		java6_rtpath	/usr/lib/jvm/java-1.6.0/jre/lib/rt.jar
+%global     java6_rtpath    %{java_home}/jre/lib/rt.jar
-%global		java6_javacpath	/usr/lib/jvm/java-1.6.0/bin/javac
+%global     java6_javacpath /usr/bin/javac
-%global		java6_javapath	/usr/lib/jvm/java-1.6.0/bin/javac
+%global     java6_javapath  /usr/bin/javac
 
-Summary:	Official JDBC driver for MySQL
+Summary:    Official JDBC driver for MySQL
-Name:		mysql-connector-java
+Name:       mysql-connector-java
-Version:	5.1.8
+Version:    5.1.12
-Release:	1%{?dist}
+Release:    1%{?dist}
-Epoch:		1 
+Epoch:      1 
 
 # MySQL FLOSS Exception
-License:	GPLv2 with exceptions
+License:    GPLv2 with exceptions
-Group:		System Environment/Libraries
+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,32 +37,33 @@ 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
+BuildRoot:          %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL:				http://dev.mysql.com/downloads/connector/j/5.1.html
-BuildRoot:			%{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel >= 1.0.31
+BuildRequires:      java-gcj-compat-devel >= 1.0.31
-Requires(post):		java-gcj-compat >= 1.0.31
+Requires(post):     java-gcj-compat >= 1.0.31
-Requires(postun):	java-gcj-compat >= 1.0.31
+Requires(postun):   java-gcj-compat >= 1.0.31
 %else
-BuildRequires:		java-devel >= 1.4.2
+BuildRequires:      java-devel >= 1.4.2
-Requires:			java >= 1.4.2
+Requires:           java >= 1.4.2
 %endif
-Requires:			jta >= 1.0
+Requires:           jta >= 1.0
-Requires:			log4j
+Requires:           log4j
-BuildRequires:		ant >= 1.6.0
+BuildRequires:      ant >= 1.6.0
-BuildRequires:		ant-contrib >= 1.0
+BuildRequires:      ant-contrib >= 1.0
-BuildRequires:		java-devel >= 1.4.0
+BuildRequires:      java-devel >= 1.4.0
-BuildRequires:		jpackage-utils >= 1.6
+BuildRequires:      jpackage-utils >= 1.6
-BuildRequires:		jta >= 1.0
+BuildRequires:      jta >= 1.0
-BuildRequires:		junit
+BuildRequires:      junit
-BuildRequires:		log4j
+BuildRequires:      log4j
-BuildRequires:		java-1.6.0-openjdk-devel
+BuildRequires:      java-1.6.0-openjdk-devel
-BuildRequires:		java-1.5.0-gcj-devel
+BuildRequires:      java-1.5.0-gcj-devel
-BuildRequires:		jakarta-commons-logging
+BuildRequires:      jakarta-commons-logging
-Provides:			mm.mysql
+
-Obsoletes:			mm.mysql
+Requires:               jpackage-utils
+Requires(post):         jpackage-utils
+Requires(postun):       jpackage-utils
 
 %description
 MySQL Connector/J is a native Java driver that converts JDBC (Java Database
@@ -87,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).
@@ -99,7 +102,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 +116,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}</' $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
+%add_to_maven_depmap mysql %{name} %{version} JPP %{name}
 
-%if %{gcj_support}
 
 %post
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
+%endif
 
 %postun
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-
 %endif
 
 %clean
@@ -138,11 +149,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 %doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README docs
 %attr(0644,root,root) %{_javadir}/*.jar
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_mavenpomdir}/*.pom
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Fri Feb 19 2010 Miloš Jakubíček <xjakub@fi.muni.cz> - 1:5.1.12-1
+- Update to 5.1.12
+
+* 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
+
 * Tue Aug 26 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 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
@@ -269,4 +295,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
-

sources

@@ -1 +1 @@
-815783766d36eb650be60718cc0be84c  mysql-connector-java-5.1.8.tar.gz
+72941cd4c75d0dc30c86c5b572d7b124  mysql-connector-java-5.1.12.tar.xz