Author: walluck
Date: Mon Dec 18 03:45:20 2006
New Revision: 98365
Added:
packages/cooker/svnkit/current/SOURCES/svnkit-1.1.0-no-javahl.patch
Modified:
packages/cooker/svnkit/current/SPECS/svnkit.spec
Log:
use external svn-javahl
Added: packages/cooker/svnkit/current/SOURCES/svnkit-1.1.0-no-javahl.patch
==============================================================================
--- (empty file)
+++ packages/cooker/svnkit/current/SOURCES/svnkit-1.1.0-no-javahl.patch Mon Dec
18 03:45:20 2006
@@ -0,0 +1,177 @@
+--- svnkit-src-1.1.0/build.xml.orig 2006-12-18 02:35:43.000000000 +0100
++++ svnkit-src-1.1.0/build.xml 2006-12-18 02:37:41.000000000 +0100
+@@ -24,20 +24,13 @@
+
+ <target name="compile-library">
+ <mkdir dir="svnkit/bin" />
+- <mkdir dir="contrib/javahl/bin" />
+ <mkdir dir="contrib/sequence/bin" />
+
+ <path id="library.classpath">
+ <pathelement location="contrib/ganymed/ganymed.jar" />
+- <pathelement path="contrib/javahl/bin" />
+ <pathelement path="contrib/sequence/bin" />
+ </path>
+
+- <javac debug="true" destdir="contrib/javahl/bin"
srcdir="contrib/javahl/src">
+- <exclude name="**/SVNClient.java" />
+- <exclude name="**/SVNAdmin.java" />
+- <exclude name="org/tigris/subversion/javahl/tests/**" />
+- </javac>
+ <javac debug="true" destdir="contrib/sequence/bin"
srcdir="contrib/sequence/src" />
+ <javac debug="true"
+ destdir="svnkit/bin"
+@@ -51,7 +44,6 @@
+ <target name="compile-library-eclipse" depends="init-environment"
if="eclipse.present">
+ <path id="library-eclipse.classpath">
+ <pathelement location="contrib/ganymed/ganymed.jar" />
+- <pathelement path="contrib/javahl/bin" />
+ <pathelement path="contrib/sequence/bin" />
+ <fileset dir="${eclipse.home}/plugins">
+ <include name="**/*.jar"/>
+@@ -103,7 +95,6 @@
+ <path id="tests.classpath">
+ <pathelement location="contrib/ganymed/ganymed.jar" />
+ <pathelement location="contrib/junit/junit.jar" />
+- <pathelement path="contrib/javahl/bin" />
+ <pathelement path="contrib/sequence/bin" />
+ <pathelement path="contrib/sequence/bin-test" />
+ <pathelement path="svnkit/bin" />
+@@ -132,8 +123,6 @@
+ <jar destfile="build/lib/svnkit.jar">
+ <fileset dir="svnkit/bin">
+ <exclude name="org/tmatesoft/svn/cli/**" />
+- <exclude name="org/tigris/subversion/javahl/SVNClient**" />
+- <exclude name="org/tigris/subversion/javahl/SVNAdmin**" />
+ </fileset>
+ <fileset dir="${basedir}" >
+ <include name="svnkit.build.properties" />
+@@ -148,21 +137,6 @@
+ <include name="org/tmatesoft/svn/core/io/repository/**" />
+ </fileset>
+ </jar>
+- <jar destfile="build/lib/svnkit-javahl.jar">
+- <fileset dir="svnkit/bin">
+- <include name="org/tigris/**" />
+- </fileset>
+- <fileset dir="contrib/javahl/bin" >
+- <exclude name="org/tigris/subversion/javahl/tests/**" />
+- <exclude name="org/tigris/subversion/javahl/SVNClient.class"
/>
+- <exclude
name="org/tigris/subversion/javahl/SVNClient$*.class" />
+- <exclude name="org/tigris/subversion/javahl/SVNAdmin.class" />
+- <exclude name="org/tigris/subversion/javahl/SVNAdmin$*.class"
/>
+- </fileset>
+- <fileset dir="contrib/javahl">
+- <include name="JAVAHL-LICENSE" />
+- </fileset>
+- </jar>
+ <copy file="contrib/ganymed/ganymed.jar" todir="build/lib" />
+ <!-- copy licences and changelog -->
+ <copy todir="build/lib" flatten="true">
+@@ -170,7 +144,6 @@
+ <include name="changelog.txt" />
+ <include name="README.txt" />
+ <include name="COPYING" />
+- <include name="contrib/javahl/JAVAHL-LICENSE" />
+ <include name="contrib/sequence/SEQUENCE-LICENSE" />
+ <include name="contrib/ganymed/GANYMED-LICENSE" />
+ </fileset>
+@@ -200,10 +173,6 @@
+ <zip destfile="build/lib/svnkitsrc.zip">
+ <fileset dir="svnkit/src" />
+ <fileset dir="svnkit-eclipse/org.tmatesoft.svnkit/src" />
+- <fileset dir="contrib/javahl/src">
+- <exclude name="org/tigris/subversion/javahl/SVNAdmin.java"/>
+- <exclude name="org/tigris/subversion/javahl/SVNClient.java"/>
+- </fileset>
+ <fileset dir="contrib/sequence/src" />
+ </zip>
+ </target>
+@@ -232,7 +201,6 @@
+ <include name="COPYING" />
+ <include name="GANYMED-LICENSE" />
+ <include name="SEQUENCE-LICENSE" />
+- <include name="JAVAHL-LICENSE" />
+ </fileset>
+ <fileset dir="svnkit-eclipse/org.tmatesoft.svnkit">
+ <include name="plugin.xml" />
+@@ -270,7 +238,6 @@
+ <path id="doc.classpath">
+ <pathelement path="svnkit/bin" />
+ <pathelement path="contrib/sequence/bin" />
+- <pathelement path="contrib/javahl/bin" />
+ </path>
+ <javadoc destdir="build/doc/javadoc" failonerror="false"
+ windowtitle="JavaDoc :: Documentation :: Pure Java
Subversion (SVN) Client Library"
+@@ -302,7 +269,6 @@
+ <!-- delete all compiled classes -->
+ <delete>
+ <fileset dir=".">
+- <include name="contrib/javahl/bin/**" />
+ <include name="contrib/sequence/bin/**" />
+ <include name="contrib/sequence/bin-test/**" />
+ <include name="svnkit/bin/**" />
+@@ -458,26 +424,19 @@
+ <target name="benchmark">
+ <!-- build library with native SVNClient -->
+ <mkdir dir="svnkit/bin" />
+- <mkdir dir="contrib/javahl/bin" />
+ <mkdir dir="contrib/sequence/bin" />
+
+ <path id="library.classpath">
+ <pathelement location="contrib/ganymed/ganymed.jar" />
+- <pathelement path="contrib/javahl/bin" />
+ <pathelement path="contrib/sequence/bin" />
+ </path>
+
+- <javac debug="true" optimize="true" destdir="contrib/javahl/bin"
srcdir="contrib/javahl/src">
+- <exclude name="org/tigris/subversion/javahl/tests/**" />
+- </javac>
+ <javac debug="true" optimize="true" destdir="contrib/sequence/bin"
srcdir="contrib/sequence/src" />
+ <javac debug="true" optimize="true"
+ destdir="svnkit/bin"
+ srcdir="svnkit/src"
+ classpathref="library.classpath"
+ >
+- <exclude name="org/tigris/subversion/javahl/SVNClient.java" />
+- <exclude name="org/tigris/subversion/javahl/SVNAdmin.java" />
+ </javac>
+ <!-- now we have native SVNClient and SVNKit's SVNClientImpl -->
+ <mkdir dir="contrib/sequence/bin-test" />
+@@ -485,7 +444,6 @@
+ <path id="tests.classpath">
+ <pathelement location="contrib/ganymed/ganymed.jar" />
+ <pathelement location="contrib/junit/junit.jar" />
+- <pathelement path="contrib/javahl/bin" />
+ <pathelement path="contrib/sequence/bin" />
+ <pathelement path="contrib/sequence/bin-test" />
+ <pathelement path="svnkit/bin" />
+@@ -511,8 +469,6 @@
+ <jar destfile="build/lib/svnkit.jar" compress="false">
+ <fileset dir="svnkit/bin">
+ <exclude name="org/tmatesoft/svn/cli/**" />
+- <exclude name="org/tigris/subversion/javahl/SVNClient**" />
+- <exclude name="org/tigris/subversion/javahl/SVNAdmin**" />
+ </fileset>
+ <fileset dir="${basedir}" >
+ <include name="svnkit.build.properties" />
+@@ -527,19 +483,10 @@
+ <include name="org/tmatesoft/svn/core/io/repository/**" />
+ </fileset>
+ </jar>
+- <jar destfile="build/lib/svnkit-javahl.jar" >
+- <fileset dir="contrib/javahl/bin" >
+- <exclude name="org/tigris/subversion/javahl/tests/**" />
+- </fileset>
+- <fileset dir="contrib/javahl">
+- <include name="JAVAHL-LICENSE" />
+- </fileset>
+- </jar>
+
+ <!-- run benchmark -->
+ <path id="benchmark.classpath">
+ <pathelement path="build/lib/svnkit.jar" />
+- <pathelement path="build/lib/svnkit-javahl.jar" />
+ <pathelement path="svnkit-test/bin" />
+ </path>
+
Modified: packages/cooker/svnkit/current/SPECS/svnkit.spec
==============================================================================
--- packages/cooker/svnkit/current/SPECS/svnkit.spec (original)
+++ packages/cooker/svnkit/current/SPECS/svnkit.spec Mon Dec 18 03:45:20 2006
@@ -3,7 +3,7 @@
Name: svnkit
Version: 1.1.0
-Release: %mkrel 1
+Release: %mkrel 2
Epoch: 0
Summary: Pure Java Subversion client library
Group: Development/Java
@@ -11,9 +11,11 @@
URL: http://svnkit.com/
# XXX: This contains the sequence library, but I cannot find the
# XXX: original upstream source.
-# XXX: It also includes javahl.
Source0: http://svnkit.com/org.tmatesoft.svn_%{version}.src.zip
Source1: svnkit-doc.tar.bz2
+Patch0: svnkit-1.1.0-no-javahl.patch
+Requires: ganymed-ssh2
+Requires: svn-javahl
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.6
%if %{gcj_support}
@@ -24,8 +26,8 @@
BuildRequires: java-devel >= 0:1.4.2
BuildArch: noarch
%endif
-BuildRequires: ganymed-ssh2 >= 0:209
-Requires: ganymed-ssh2 >= 0:209
+BuildRequires: ganymed-ssh2
+BuildRequires: svn-javahl
Obsoletes: javasvn
Provides: javasvn = %{epoch}:%{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -49,13 +51,14 @@
%prep
%setup -q -n %{name}-src-%{version}
%setup -q -n %{name}-src-%{version} -T -D -a 1
+%patch0 -p1
%{__rm} contrib/ganymed/ganymed.jar
%{__ln_s}f %{_javadir}/ganymed-ssh2.jar contrib/ganymed/ganymed.jar
%{__rm} contrib/junit/junit.jar
%build
-export CLASSPATH=
+export CLASSPATH=$(%{_bindir}/build-classpath svn-javahl)
export OPT_JAR_LIST=
%{ant} build-library
%{ant} build-doc
@@ -65,15 +68,15 @@
%{__mkdir_p} %{buildroot}%{_javadir}
%{__cp} -a build/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-%{__cp} -a build/lib/%{name}-javahl.jar
%{buildroot}%{_javadir}/%{name}-javahl-%{version}.jar
-
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar}
${jar/-%{version}/}; done)
%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
%{__cp} -a build/doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-%{__perl} -pi -e 's/\r$//g' *.txt
+pushd build/lib
+%{__perl} -pi -e 's/\r$//g' README.txt SEQUENCE-LICENSE changelog.txt
+popd
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
@@ -101,11 +104,9 @@
%files
%defattr(0644,root,root,0755)
-%doc changelog.txt README.txt
+%doc build/lib/{README.txt,SEQUENCE-LICENSE,changelog.txt}
%{_javadir}/svnkit-%{version}.jar
%{_javadir}/svnkit.jar
-%{_javadir}/svnkit-javahl-%{version}.jar
-%{_javadir}/svnkit-javahl.jar
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/*
