commit ad1f07cd23662a98f112011c6731b46978e102f4 Author: gil <puntogil(a)libero.it&gt; Date: Thu Aug 1 15:57:38 2013 +0200 update to 1.3.1, minor changes for adapt to current guideline .gitignore | 1 + jtds-1.2.5-pom.patch | 20 - jtds-1.2.6-build.patch | 66 -- jtds-1.2.6-update-fsf-address.patch | 1305 ----------------------------------- jtds-1.3.1-build.patch | 141 ++++ jtds-create-tarball.sh | 31 + jtds.spec | 46 +- sources | 2 +- 8 files changed, 191 insertions(+), 1421 deletions(-) --- diff --git a/.gitignore b/.gitignore index c66a490..9ae8bc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /jtds-1.2.6-clean-src.tar.gz +/jtds-1.3.1-clean.tar.xz diff --git a/jtds-1.3.1-build.patch b/jtds-1.3.1-build.patch new file mode 100644 index 0000000..b951083 --- /dev/null +++ b/jtds-1.3.1-build.patch @@ -0,0 +1,141 @@ +--- build.xml 2013-06-08 12:27:50.000000000 +0200 ++++ build.xml-gil 2013-08-01 15:20:18.940074567 +0200 +@@ -1,14 +1,12 @@ + <?xml version="1.0" encoding="UTF-8"?> +-<project basedir="." default="compile" name="jtds" xmlns:artifact="antlib:org.apache.maven.artifact.ant"> ++<project basedir="." default="compile" name="jtds"> + + <path id="libs"> +- <fileset dir="lib" includes="*.jar"/> ++ <pathelement location="/usr/share/java/jcifs.jar"/> ++ <pathelement location="/usr/share/java/junit.jar"/> ++ <pathelement location="${java.home}/jre/lib/rt.jar"/> + </path> + +- <!-- include maven ant task lib --> +- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" /> +- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" /> +- + <target name="init"> + <tstamp/> + +@@ -53,18 +51,18 @@ + </target> + + <target name="compile" depends="init,prepare"> +- <javac destdir="${build}/classes" srcdir="${build}/src" classpathref="libs" debug="${javac.debug}" optimize="${javac.optimize}" encoding="latin1"/> ++ <javac destdir="${build}/classes" srcdir="${build}/src" classpathref="libs" debug="${javac.debug}" optimize="${javac.optimize}" source="1.7" target="1.7" encoding="utf-8"/> + </target> + + <target name="compile-test" depends="init,prepare,compile"> +- <javac destdir="${build}/testclasses" srcdir="${build}/testsrc" classpathref="libs" classpath="${build}/classes" debug="${javac.debug}" optimize="${javac.optimize}" encoding="latin1"/> ++ <javac destdir="${build}/testclasses" srcdir="${build}/testsrc" classpathref="libs" classpath="${build}/classes" debug="${javac.debug}" optimize="${javac.optimize}" source="1.7" target="1.7" encoding="utf-8"/> + </target> + + <target name="javadoc" depends="prepare"> + <mkdir dir="${build}/doc"/> +- <javadoc sourcepath="${build}/src;${build}/testsrc" destdir="${build}/doc" packagenames="net.sourceforge.jtds.*" Author="true" ++ <javadoc sourcepath="${build}/src" destdir="${build}/doc" packagenames="net.sourceforge.jtds.*" Author="true" + Doctitle="jTDS API Documentation" Use="true" Version="true" bottom="Generated on ${TODAY}" +- Windowtitle="jTDS API" Private="true" classpathref="libs" encoding="latin1"> ++ Windowtitle="jTDS API" Private="true" classpathref="libs" source="1.7" encoding="utf-8"> + <tag name="todo" description="To do:"/> + <tag name="created" description="Created:"/> + </javadoc> +@@ -99,13 +97,17 @@ + </target> + + <target name="test" depends="compile,compile-test"> +- <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/> ++ <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" classpath="/usr/share/java/ant/ant-junit.jar"/> + + <junit fork="no" haltonfailure="no" printsummary="yes"> + <classpath> + <pathelement location="build/classes"/> + <pathelement location="build/testclasses"/> + <path refid="libs"/> ++ <fileset dir="/usr/share/java"> ++ <include name="junit.jar"/> ++ <include name="ant/ant-junit.jar"/> ++ </fileset> + </classpath> + <formatter type="plain"/> + <batchtest todir="${build}/testrep" > +@@ -157,26 +159,6 @@ + <fileset dir="${build}" includes="${ant.project.name}-${version}.jar"/> + </copy> + +- <mkdir dir="${dist}/tmp/x86/XA"/> +- <copy todir="${dist}/tmp/x86/XA"> +- <fileset dir="lib/x86/XA" includes="JtdsXA.dll"/> +- <fileset dir="src/XA" includes="*.sql"/> +- </copy> +- <mkdir dir="${dist}/tmp/x86/SSO"/> +- <copy todir="${dist}/tmp/x86/SSO"> +- <fileset dir="lib/x86/SSO" includes="ntlmauth.dll"/> +- </copy> +- +- <mkdir dir="${dist}/tmp/x64/SSO"/> +- <copy todir="${dist}/tmp/x64/SSO"> +- <fileset dir="lib/x64/SSO" includes="ntlmauth.dll"/> +- </copy> +- +- <mkdir dir="${dist}/tmp/IA64/SSO"/> +- <copy todir="${dist}/tmp/IA64/SSO"> +- <fileset dir="lib/IA64/SSO" includes="ntlmauth.dll"/> +- </copy> +- + <zip basedir="${dist}/tmp" includes="**/*" zipfile="${dist}/${ant.project.name}-${version}-dist.zip"/> + <delete dir="${dist}/tmp"/> + </target> +@@ -185,8 +167,6 @@ + + <target name="maven_upload" depends="dist" description="deploy release version to Maven staging repository"> + +- <input message="Please enter GPG passphrase:" addproperty="passphrase" /> +- + <!-- define Maven coordinates --> + <property name="groupId" value="jtds.sourceforge.net" /> + <property name="artifactId" value="jtds" /> +@@ -200,41 +180,6 @@ + <property name="maven-staging-repository-id" value="sonatype-nexus-staging" /> + <property name="maven-staging-repository-url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2/... /> + +- <!-- sign and deploy the driver artifact --> +- <artifact:mvn> +- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" /> +- <arg value="-Dgpg.passphrase=${passphrase}" /> +- <arg value="-Durl=${maven-staging-repository-url}" /> +- <arg value="-DrepositoryId=${maven-staging-repository-id}" /> +- <arg value="-DpomFile=pom.xml" /> +- <arg value="-Dfile=${maven-jar}" /> +- <arg value="-Pgpg" /> +- </artifact:mvn> +- +- <!-- sign and deploy the sources artifact --> +- <artifact:mvn> +- +- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" /> +- <arg value="-Dgpg.passphrase=${passphrase}" /> +- <arg value="-Durl=${maven-staging-repository-url}" /> +- <arg value="-DrepositoryId=${maven-staging-repository-id}" /> +- <arg value="-DpomFile=pom.xml" /> +- <arg value="-Dfile=${maven-sources-jar}" /> +- <arg value="-Dclassifier=sources" /> +- <arg value="-Pgpg" /> +- </artifact:mvn> +- +- <!-- sign and deploy the javadoc artifact --> +- <artifact:mvn> +- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" /> +- <arg value="-Dgpg.passphrase=${passphrase}" /> +- <arg value="-Durl=${maven-staging-repository-url}" /> +- <arg value="-DrepositoryId=${maven-staging-repository-id}" /> +- <arg value="-DpomFile=pom.xml" /> +- <arg value="-Dfile=${maven-javadoc-jar}" /> +- <arg value="-Dclassifier=javadoc" /> +- <arg value="-Pgpg" /> +- </artifact:mvn> + + </target> + diff --git a/jtds-create-tarball.sh b/jtds-create-tarball.sh new file mode 100644 index 0000000..4a131c3 --- /dev/null +++ b/jtds-create-tarball.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +if [ $# -ne 1 ]; then + echo "Usage: ./create-sources VERSION" + exit 1 +fi + +VERSION=${1} +NAME="jtds" + +wget http://downloads.sourceforge.net/${NAME}/${NAME}-${VERSION}-src.zip +mkdir ${NAME}-${VERSION} +cd ${NAME}-${VERSION} +unzip ../${NAME}-${VERSION}-src.zip +cd .. +rm ${NAME}-${VERSION}-src.zip +# Remove unnecessary files +find ./${NAME}-${VERSION} -name "*.jar" -delete +find ./${NAME}-${VERSION} -name "*.class" -delete +find ./${NAME}-${VERSION} -name "*.bat" -delete +rm -Rf ./${NAME}-${VERSION}/lib +rm -Rf ./${NAME}-${VERSION}/doc +rm -Rf ./${NAME}-${VERSION}/html +rm -Rf ./${NAME}-${VERSION}/*.bat +# Files without proper copyright notices and unused +rm -vRf ./${NAME}-${VERSION}/src/SSO +rm -vRf ./${NAME}-${VERSION}/src/XA +rm -vRf ./${NAME}-${VERSION}/src/test/net/sourceforge/jtds/test/{AsTest.java,CSUnitTest.java,DatabaseTestCase.java,JDBC3Test.java,NtlmAuthTest.java,SAfeTest.java,SanityTest.java,Tds5Test.java,TestBase.java,TimestampTest.java,UpdateTest.java} +rm -vRf ./${NAME}-${VERSION}/src/tools/net/sourceforge/jtds/tools/{PacketLogger.java,SQLProxy.java,SqlForwarder.java} + +tar cJf ${NAME}-${VERSION}-clean.tar.xz ./${NAME}-${VERSION} \ No newline at end of file diff --git a/jtds.spec b/jtds.spec index 50b129e..4ded99e 100644 --- a/jtds.spec +++ b/jtds.spec @@ -1,30 +1,17 @@ Name: jtds -Version: 1.2.6 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: SQL Server and Sybase JDBC driver -Group: Development/Libraries License: MIT and LGPLv2+ URL: http://jtds.sourceforge.net/ -# wget http://sourceforge.net/projects/jtds/files/jtds/1.2.6/jtds-1.2.6-src.zip -# cleanup -# rm -rf lib doc html *.bat -# Files without proper copyright notices and unused -# rm -vrf src/SSO -# rm -vrf src/XA -# rm -vf src/test/net/sourceforge/jtds/test/{AsTest.java,CSUnitTest.java,DatabaseTestCase.java,JDBC3Test.java,NtlmAuthTest.java,SAfeTest.java,SanityTest.java,Tds5Test.java,TestBase.java,TimestampTest.java,UpdateTest.java} -# rm -vf src/tools/net/sourceforge/jtds/tools/{PacketLogger.java,SQLProxy.java,SqlForwarder.java} -# find . -name '*.jar' -o -name '*.class' -o -name '*.bat' -delete -# tar czf jtds-1.2.6-clean-src.tar.gz jtds-1.2.6 -Source0: %{name}-%{version}-clean-src.tar.gz -# remove org.codehaus.mojo truezip-maven-plugin 1.0-beta-2 -Patch0: %{name}-1.2.5-pom.patch +# sh jtds-create-tarball.sh < VERSION > +Source0: %{name}-%{version}-clean.tar.xz +Source1: %{name}-create-tarball.sh # fix libraries path # disable test unavailable deps # fix javac/javadoc source/target/encoding parameters # remove classpath from manifest -Patch1: %{name}-%{version}-build.patch - -Patch2: %{name}-%{version}-update-fsf-address.patch +Patch0: %{name}-1.3.1-build.patch BuildRequires: java-devel BuildRequires: jpackage-utils @@ -32,6 +19,9 @@ BuildRequires: jpackage-utils BuildRequires: ant BuildRequires: jcifs BuildRequires: jdbc-stdext +# test deps +#BuildRequires: ant-junit +#BuildRequires: junit Requires: jcifs @@ -50,9 +40,7 @@ independent) Statements and implementing all the DatabaseMetaData and ResultSetMetaData methods. %package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc This package contains javadoc for %{name}. @@ -66,11 +54,10 @@ for d in CHANGELOG LICENSE README* ; do done %patch0 -p0 -%patch1 -p0 -%patch2 -p1 # fix non ASCII chars -for s in src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java;do +for s in src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java \ + src/test/net/sourceforge/jtds/jdbc/CSUnitTest.java;do native2ascii -encoding UTF8 ${s} ${s} done @@ -85,15 +72,12 @@ install -m 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar mkdir -p %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar +%add_maven_depmap mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name} -%files -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc CHANGELOG LICENSE README* %files javadoc @@ -101,6 +85,10 @@ cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name} %doc LICENSE %changelog +* Thu Aug 01 2013 gil cattaneo <puntogil(a)libero.it&gt; 1.3.1-1 +- update to 1.3.1 +- minor changes for adapt to current guideline + * Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 1.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 8608043..32012c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -334374fe53dffcbf3dbf53f5347e8946 jtds-1.2.6-clean-src.tar.gz +1ef19611b0a6de922894366e644a38bc jtds-1.3.1-clean.tar.xz