rpms/svnkit/devel svnkit-1.3.2-dependencies.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 svnkit.spec, 1.13, 1.14 svnkit-1.2.2-dependencies.patch, 1.1, NONE

Alexander Kurtakov akurtakov at fedoraproject.org
Thu Dec 3 11:35:15 UTC 2009 

Author: akurtakov

Update of /cvs/pkgs/rpms/svnkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10430/devel

Modified Files:
	.cvsignore sources svnkit.spec 
Added Files:
	svnkit-1.3.2-dependencies.patch 
Removed Files:
	svnkit-1.2.2-dependencies.patch 
Log Message:
Update to 1.3.2.

svnkit-1.3.2-dependencies.patch:
 build.xml                                       |   11 ++++++-----
 svnkit-eclipse/com.sun.jna/MANIFEST.MF          |    2 +-
 svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF |    1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE svnkit-1.3.2-dependencies.patch ---
--- svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF.orig	2009-08-11 23:09:44.000000000 +0300
+++ svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF	2009-12-03 11:22:40.006747135 +0200
@@ -14,6 +14,7 @@ Require-Bundle: com.sun.jna;bundle-versi
 Bundle-ClassPath: .,
  svnkit.jar,
  svnkit-javahl.jar,
+ svn-javahl.jar,
  trilead.jar,
  sqljet.%sqljet.version%.jar,
  antlr-runtime-%antlr.version%.jar
--- build.xml.orig	2009-11-24 12:52:48.000000000 +0200
+++ build.xml	2009-12-03 11:25:45.749957330 +0200
@@ -34,7 +34,8 @@
 
         <path id="library.classpath">
             <pathelement location="contrib/trilead/trilead.jar" />
-            <pathelement location="contrib/jna/jna.jar" />            
+            <pathelement location="contrib/jna/jna.jar" /> 
+        	 <pathelement location="contrib/javahl/svn-javahl.jar" />
             <pathelement location="contrib/sqljet/antlr-runtime-${antlr.version}.jar" />            
             <pathelement location="contrib/sqljet/sqljet.jar" />            
 
@@ -43,11 +44,11 @@
             <pathelement path="svnkit/bin" />
         </path>
 
-        <javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">
+        <!--javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">
             <exclude name="**/SVNClient.java" />
             <exclude name="**/SVNAdmin.java" />
             <exclude name="**/Path.java" />
-        </javac>
+        </javac-->
         <javac debug="true" destdir="contrib/sequence/bin" srcdir="contrib/sequence/src" />
         <javac debug="true" destdir="svnkit/bin" srcdir="svnkit/src" classpathref="library.classpath">
             <exclude name="org/tmatesoft/svn/util/SVNTest.java"/>
@@ -304,11 +305,11 @@
         <zip destfile="build/lib/svnkitsrc.zip">
             <fileset dir="svnkit/src" />
             <fileset dir="svnkit-eclipse/org.tmatesoft.svnkit/src" />
-            <fileset dir="contrib/javahl/src">
+<!--            <fileset dir="contrib/javahl/src">
             	<exclude name="org/tigris/subversion/javahl/SVNAdmin.java"/>
             	<exclude name="org/tigris/subversion/javahl/SVNClient.java"/>
                 <exclude name="org/tigris/subversion/javahl/Path.java"/>
-            </fileset>
+            </fileset>-->
             <fileset dir="contrib/sequence/src" />
             <fileset dir="${basedir}" >
                 <include name="COPYING" />
--- svnkit-eclipse/com.sun.jna/MANIFEST.MF.orig	2009-11-13 21:05:48.000000000 +0200
+++ svnkit-eclipse/com.sun.jna/MANIFEST.MF	2009-12-03 13:06:12.934956961 +0200
@@ -4,7 +4,7 @@ Bundle-Name: JNA Library Plug-in
 Bundle-SymbolicName: com.sun.jna
 Bundle-Version: %jna.version%
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ClassPath: .
+Bundle-ClassPath: jna.jar
 Export-Package: com.sun.jna,
  com.sun.jna.win32,
  com.sun.jna.ptr


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/svnkit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	24 Jul 2009 14:09:30 -0000	1.6
+++ .cvsignore	3 Dec 2009 11:35:15 -0000	1.7
@@ -1,2 +1,3 @@
 org.tmatesoft.svn_1.2.3.src-CLEAN.zip
 org.tmatesoft.svn_1.3.0.src-CLEAN.zip
+org.tmatesoft.svn_1.3.2.src-CLEAN.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/svnkit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Jul 2009 14:09:30 -0000	1.6
+++ sources	3 Dec 2009 11:35:15 -0000	1.7
@@ -1 +1 @@
-a4c8787ceb54ef525c7d18b05923c9e2  org.tmatesoft.svn_1.3.0.src-CLEAN.zip
+3bcbbda3423b41e892224dea85b80e6a  org.tmatesoft.svn_1.3.2.src-CLEAN.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- svnkit.spec	24 Jul 2009 14:09:30 -0000	1.13
+++ svnkit.spec	3 Dec 2009 11:35:15 -0000	1.14
@@ -1,4 +1,4 @@
-%define svn_revision     5847
+%define svn_revision     6267
 
 %define eclipse_name     eclipse
 %define eclipse_base     %{_libdir}/%{eclipse_name}
@@ -8,11 +8,11 @@
 %define local_features   %{local_dropins}/features
 %define core_plugin_name org.tmatesoft.svnkit_%{version}
 %define core_plugin_dir  %{local_plugins}/%{core_plugin_name}
-%define jna_plugin_name  com.sun.jna_3.0.9
+%define jna_plugin_name  com.sun.jna_3.2.3
 %define jna_plugin_dir   %{local_plugins}/%{jna_plugin_name}
 
 Name:           svnkit
-Version:        1.3.0
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
@@ -24,7 +24,7 @@ URL:            http://www.svnkit.com/
 # repackaged removing binary dependencies using:
 # zip $FILE -d \*.jar
 Source0:        org.tmatesoft.svn_%{version}.src-CLEAN.zip
-Patch0:         svnkit-1.2.2-dependencies.patch
+Patch0:         svnkit-1.3.2-dependencies.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,8 +39,10 @@ BuildRequires:          subversion-javah
 Requires:               subversion-javahl >= 1.5
 BuildRequires:          jna >= 3.0
 BuildRequires:          trilead-ssh2 >= 213
+BuildRequires:          sqljet
 Requires:               jna >= 3.0
 Requires:               trilead-ssh2 >= 213
+Requires:               sqljet
 Obsoletes:              javasvn <= 1.1.0
 
 
@@ -69,7 +71,7 @@ Eclipse feature for SVNKit - Java Subver
 
 %prep
 %setup -q -n %{name}-src-%{version}.%{svn_revision}
-%patch0 -p1
+%patch0 
 
 # delete the jars that are in the archive
 JAR_files=""
@@ -91,6 +93,8 @@ rm contrib/trilead/trileadsrc.zip
 ln -s /usr/share/java/svn-javahl.jar contrib/javahl
 ln -sf %{_javadir}/jna.jar contrib/jna/jna.jar
 ln -sf %{_javadir}/trilead-ssh2.jar contrib/trilead/trilead.jar
+ln -sf %{_javadir}/sqljet.jar contrib/sqljet/sqljet.jar
+ln -sf %{_javadir}/antlr3.jar contrib/sqljet/antlr-runtime-3.1.3.jar
 
 # fixing wrong-file-end-of-line-encoding warnings
 sed -i 's/\r//' README.txt doc/javadoc/package-list
@@ -124,7 +128,8 @@ unzip build/eclipse/site/plugins/%{core_
  
 # removing plugin internal jars and sources
 rm -f $RPM_BUILD_ROOT%{jna_plugin_dir}/jna.jar
-rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/{svnkitsrc.zip,trilead.jar,svnkit.jar,svnkit-javahl.jar}
+rm -fR $RPM_BUILD_ROOT%{jna_plugin_dir}/com
+rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/{svnkitsrc.zip,trilead.jar,svnkit.jar,svnkit-javahl.jar,sqljet.1.0.1.jar,antlr-runtime-3.1.3.jar}
 
 # main library links
 pushd $RPM_BUILD_ROOT%{_javadir}/
@@ -138,6 +143,8 @@ ln -s %{_javadir}/svn-javahl.jar $RPM_BU
 ln -s %{_javadir}/trilead-ssh2.jar $RPM_BUILD_ROOT%{core_plugin_dir}/trilead.jar
 ln -s %{_javadir}/svnkit.jar $RPM_BUILD_ROOT%{core_plugin_dir}
 ln -s %{_javadir}/jna.jar $RPM_BUILD_ROOT%{jna_plugin_dir}
+ln -s %{_javadir}/sqljet.jar $RPM_BUILD_ROOT%{core_plugin_dir}/sqljet.1.0.1.jar
+ln -s %{_javadir}/antlr3.jar $RPM_BUILD_ROOT%{core_plugin_dir}/antlr-runtime-3.1.3.jar
 
 
 %clean
@@ -160,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 3 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3.2-1
+- Update to 1.3.2.
+
 * Fri Jul 24 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3.0-1
 - Update to 1.3.0.
 


--- svnkit-1.2.2-dependencies.patch DELETED ---

More information about the fedora-extras-commits mailing list