diff --git a/.cvsignore b/.cvsignore index e69de29..ee8b239 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +mysql-connector-java-3.1.12.tar.gz diff --git a/mysql-connector-java-noSunAppletSecurity.patch b/mysql-connector-java-noSunAppletSecurity.patch new file mode 100644 index 0000000..d3c3068 --- /dev/null +++ b/mysql-connector-java-noSunAppletSecurity.patch @@ -0,0 +1,32 @@ +--- src/testsuite/regression/AppletRegressionTest.java.orig 2006-05-31 11:43:13.000000000 -0400 ++++ src/testsuite/regression/AppletRegressionTest.java 2006-05-31 11:44:23.000000000 -0400 +@@ -26,7 +26,7 @@ + + import java.util.Properties; + +-import sun.applet.AppletSecurity; ++//import sun.applet.AppletSecurity; + import testsuite.BaseTestCase; + + /** +@@ -66,9 +66,9 @@ + * @throws Exception + * if the test fails + */ +- public void testAppletSecurityManager() throws Exception { ++ public void testSecurityManagerManager() throws Exception { + if ("true".equalsIgnoreCase(System.getProperty(TOGGLE_RUN_PROPERTY))) { +- System.setSecurityManager(new CustomAppletSecurity()); ++ System.setSecurityManager(new CustomSecurityManager()); + + getConnectionWithProps(new Properties()); + } +@@ -78,7 +78,7 @@ + * We need to customize the security manager a 'bit', so that JUnit still + * works (and we can connect to various databases). + */ +- class CustomAppletSecurity extends AppletSecurity { ++ class CustomSecurityManager extends SecurityManager { + /* + * (non-Javadoc) + * diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec new file mode 100644 index 0000000..5c3a1e3 --- /dev/null +++ b/mysql-connector-java.spec @@ -0,0 +1,223 @@ +%define builddir build-mysql-jdbc +%define distdir dist-mysql-jdbc +%define gcj_support 1 + +Summary: Official JDBC driver for MySQL +Name: mysql-connector-java +Version: 3.1.12 +Release: 1jpp_5fc%{?dist} +Epoch: 1 +License: GPL +Group: System Environment/Libraries +# ************ NOTE ************ +# The following files have been removed from the tarball to avoid licensing +# issues due to the fact that they are not distributed with their source. +# +# src/lib/ant-contrib.jar +# src/lib/jta-spec1_0_1.jar +# src/lib/junit.jar +# src/lib/log4j-1.2.9.jar +# src/lib/aspectjrt.jar +# src/lib/aspectjtools.jar +# src/lib/c3p0-0.8.5-pre8.jar +# src/lib/jboss-common-jdbc-wrapper.jar +# src/lib/jboss-lgpl.txt +# src/lib/jdbc2_0-stdext.jar +# mysql-connector-java-3.1.12-bin.jar +# debug/mysql-connector-java-3.1.12-bin-g.jar +Source0: %{name}-%{version}.tar.gz +Patch0: patch-build.xml +Patch1: mysql-connector-java-noSunAppletSecurity.patch +URL: http://dev.mysql.com/downloads/connector/j/3.1.html +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 +%else +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 +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. +It lets developers working with the Java programming language easily build +programs and applets that interact with MySQL and connect all corporate +data, even in a heterogeneous environment. MySQL Connector/J is a Type +IV JDBC driver and has a complete JDBC feature set that supports the +capabilities of MySQL. + +%prep +%setup -q -n %{name}-%{version} +%patch0 +%patch1 + +# Remove duplicate README.txt files +rm README.txt +rm docs/README.txt + +# fix line endings +%{__sed} -i 's/\r//' README +%{__sed} -i 's/\r//' docs/README +%{__sed} -i 's/\r//' EXCEPTIONS-CONNECTOR-J + + +%build +export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j) +ant -DbuildDir=%{builddir} -DdistDir=%{distdir} + +%install +rm -rf $RPM_BUILD_ROOT + +install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +install -m 644 %{builddir}/%{name}-%{version}/%{name}-%{version}-bin.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + +(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + +# natively compile +%if %{gcj_support} +%{_bindir}/aot-compile-rpm +%endif + + +%if %{gcj_support} + +%post +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi + +%postun +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi + +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(0644,root,root,0755) +%doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README docs +%attr(0644,root,root) %{_javadir}/*.jar +%if %{gcj_support} +%attr(-,root,root) %{_libdir}/gcj/%{name} +%endif + +%changelog +* Fri Sep 08 2006 Igor Foox 1:3.1.12-1jpp_5fc +- Add dist tag. + +* Thu Sep 07 2006 Igor Foox 1:3.1.12-1jpp_4fc +- Fix indentation of preamble. +- Fix version and epoch of jta Requires. +- Fix Group from Development/Libraries to System Environment/Libraries. + +* Wed Sep 06 2006 Igor Foox 1:3.1.12-1jpp_3fc +- Remove duplicate readme files. +- Remove binary jars from distributed tarball, since they have no source + attached to them, and are in violation of the LGPL. +- Change jta BR to 1.0 from 1.0.1 since geronimo-specs-compat is 1.0. +- Remove unneccessary 0 epoch from BRs. + +* Thu Jul 20 2006 Igor Foox 1:3.1.12-1jpp_2fc +- Fix line endings. +- Change Group to standard Development/Java. + +* Thu Jun 1 2006 Igor Foox 1:3.1.12-1jpp_1fc +- Natively compile +- Add mysql-connector-java-noSunAppletSecurity.patch to take out references +to sun classes +- Change BuildRoot to what Extras expects + +* Thu Feb 2 2006 Jason Corley 1:3.1.12-1jpp +- 3.1.12 +- add some more docs from the tarball +- correct url +- remove vendor and distribution, should be defined in ~/.rpmmacros instead + +* Sun May 14 2005 Jason Corley 1:3.1.8-0.a.1jpp +- 3.1.8a + +* Sun Feb 13 2005 Jason Corley 1:3.1.6-1jpp +- Update to 3.1.6 now that it's considered stable + +* Sat Feb 12 2005 Jason Corley 1:3.0.16-1jpp +- Update to 3.0.16 + +* Mon Aug 23 2004 Fernando Nasser 1:3.0.14-1jpp +- Update to 3.0.14 +- Rebuilt with Ant 1.6.2 + +* Wed Mar 24 2004 Kaj J. Niemi 1:3.0.11-1jpp +- Bumped epoch, back to a "stable" release + +* Fri Mar 19 2004 Kaj J. Niemi 0:3.1.1-1jpp +- 3.1.1, supports stored procedures and SAVEPOINTs among other things. +- Tidy .spec file: nicer description and don't own %%{_javadir} + +* Wed Jan 21 2004 David Walluck 0:3.0.10-1jpp +- 3.0.10 +- change group + +* Wed Oct 05 2003 Henri Gomez 0:3.0.9-1jpp +- mysql-connector-j 3.0.9 + +* Mon Jul 07 2003 Henri Gomez 3.0.8.2jpp +- mysql-connector-j 3.0.8 +- jar goes back in /usr/share/java + +* Sun May 11 2003 David Walluck 0:3.0.6-2jpp +- update for JPackage 1.5 + +* Tue Mar 25 2003 Nicolas Mailhot 3.0.6-1jpp +- For jpackage-utils 1.5 +- New project name +- Requires java >= 1.4.1 + +* Thu Jun 06 2002 Henri Gomez 2.0.14.1jpp +- mm.mysql 2.0.14 + +* Tue May 07 2002 Henri Gomez 2.0.13.1jpp +- mm.mysql 2.0.13 + +* Tue Mar 26 2002 Henri Gomez 2.0.11.2jpp +- correct changelog + +* Mon Feb 04 2002 Henri Gomez +- mm.mysql 2.0.11 + +* Thu Jan 17 2002 Henri Gomez +- mm.mysql 2.0.8 +- seriously patch build.xml to make it compile on Linux boxes + with both JDK 1.2/1.3 and 1.1 +- added javadoc generation to build.xml +- changed manual to javadoc package + +* Tue Feb 06 2001 Henri Gomez +- mm.mysql 2.0.4 +- Fixes to getDecimal to fix decimal place wrong bug + +* Mon Jan 15 2001 Henri Gomez +- Initial release mm.mysql 2.0.3 +- detect jdbc-2.0 extension jar (javax.sql) and if present + 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/patch-build.xml b/patch-build.xml new file mode 100644 index 0000000..aabc5f9 --- /dev/null +++ b/patch-build.xml @@ -0,0 +1,13 @@ +--- build.xml.orig 2006-01-31 15:27:27.000000000 -0800 ++++ build.xml 2006-01-31 15:28:05.000000000 -0800 +@@ -60,10 +60,6 @@ + + + +- +- +- +- + + + diff --git a/sources b/sources index e69de29..e656466 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +ca9d3c88dbb5ad5c724fe9ac576fc427 mysql-connector-java-3.1.12.tar.gz