rpms/svnkit/F-10 svnkit-1.2.2-dependencies.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 svnkit.spec, 1.8, 1.9

Robert Marcano robmv at fedoraproject.org
Mon Mar 23 13:53:15 UTC 2009 

Author: robmv

Update of /cvs/extras/rpms/svnkit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30839

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


svnkit-1.2.2-dependencies.patch:

--- NEW FILE svnkit-1.2.2-dependencies.patch ---
diff -Naur svnkit-src-1.2.2.5405.original/build.xml svnkit-src-1.2.2.5405/build.xml
--- svnkit-src-1.2.2.5405.original/build.xml	2009-02-16 11:48:00.000000000 -0430
+++ svnkit-src-1.2.2.5405/build.xml	2009-02-16 13:17:06.000000000 -0430
@@ -35,16 +35,17 @@
         <path id="library.classpath">
             <pathelement location="contrib/trilead/trilead.jar" />
             <pathelement location="contrib/jna/jna.jar" />            
+            <pathelement location="contrib/javahl/svn-javahl.jar" />
             <pathelement path="contrib/javahl/bin" />
             <pathelement path="contrib/sequence/bin" />
             <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"/>
@@ -249,11 +250,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" />
@@ -519,13 +520,13 @@
 				<exclude name=".svn"/>
 				<exclude name=".svn/**"/>
 			</zipfileset>
-			<zipfileset dir="contrib/javahl/src" prefix="src">
+			<!--<zipfileset dir="contrib/javahl/src" prefix="src">
 				<exclude name=".svn"/>
 				<exclude name=".svn/**"/>
                 <exclude name="org/tigris/subversion/javahl/SVNClient.java" />
                 <exclude name="org/tigris/subversion/javahl/SVNAdmin.java" />
                 <exclude name="org/tigris/subversion/javahl/Path.java" />
-			</zipfileset>
+			</zipfileset>-->
 			<zipfileset dir="contrib/sequence/src" prefix="src">
 				<exclude name=".svn"/>
 				<exclude name=".svn/**"/>
diff -Naur svnkit-src-1.2.2.5405.original/.classpath svnkit-src-1.2.2.5405/.classpath
--- svnkit-src-1.2.2.5405.original/.classpath	2009-02-16 11:48:00.000000000 -0430
+++ svnkit-src-1.2.2.5405/.classpath	2009-02-16 11:52:10.000000000 -0430
@@ -6,7 +6,8 @@
 	<classpathentry kind="src" output="doc/examples/bin" path="doc/examples/src"/>
 	<classpathentry kind="src" output="svnkit-eclipse/bin" path="svnkit-eclipse/org.tmatesoft.svnkit/src"/>
 	<classpathentry kind="src" output="svnkit-test/bin" path="svnkit-test/src"/>
-	<classpathentry excluding="**/Path.java|**/SVNAdmin.java|**/SVNClient.java" kind="src" output="contrib/javahl/bin" path="contrib/javahl/src"/>
+<!--	<classpathentry excluding="**/Path.java|**/SVNAdmin.java|**/SVNClient.java" kind="src" output="contrib/javahl/bin" path="contrib/javahl/src"/>-->
+	<classpathentry kind="lib" path="contrib/javahl/svn-javahl.jar"/>
 	<classpathentry kind="src" output="contrib/sequence/bin" path="contrib/sequence/src"/>
 	<classpathentry kind="src" output="contrib/sequence/bin" path="contrib/sequence/src-test"/>
 	<classpathentry kind="lib" path="contrib/junit/junit.jar"/>
diff -Naur svnkit-src-1.2.2.5405.original/svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF svnkit-src-1.2.2.5405/svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF
--- svnkit-src-1.2.2.5405.original/svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF	2009-02-16 11:48:00.000000000 -0430
+++ svnkit-src-1.2.2.5405/svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF	2009-02-16 14:03:35.000000000 -0430
@@ -14,6 +14,7 @@
 Bundle-ClassPath: .,
  svnkit.jar,
  svnkit-javahl.jar,
+ svn-javahl.jar,
  trilead.jar
 Export-Package: com.trilead.ssh2,
  com.trilead.ssh2.auth,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2007 13:27:20 -0000	1.3
+++ .cvsignore	23 Mar 2009 13:52:44 -0000	1.4
@@ -1 +1 @@
-org.tmatesoft.svn_1.1.4.src.zip
+org.tmatesoft.svn_1.2.3.src-CLEAN.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2007 13:27:20 -0000	1.3
+++ sources	23 Mar 2009 13:52:44 -0000	1.4
@@ -1 +1 @@
-f1c33294199b8804b00ac9bd060ced74  org.tmatesoft.svn_1.1.4.src.zip
+d5c425b5d2b49c2b0f3795557e580abc  org.tmatesoft.svn_1.2.3.src-CLEAN.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/extras/rpms/svnkit/F-10/svnkit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- svnkit.spec	7 Sep 2008 15:03:19 -0000	1.8
+++ svnkit.spec	23 Mar 2009 13:52:44 -0000	1.9
@@ -1,37 +1,46 @@
-%define gcj_support     1
+%define svn_revision     5521
 
+%define eclipse_name     eclipse
+%define eclipse_base     %{_libdir}/%{eclipse_name}
+%define install_loc      %{_datadir}/eclipse/dropins
+%define local_dropins    %{install_loc}/svnkit/eclipse
+%define local_plugins    %{local_dropins}/plugins
+%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_dir   %{local_plugins}/%{jna_plugin_name}
 
 Name:           svnkit
-Version:        1.1.4
-Release:        4%{?dist}
+Version:        1.2.3
+Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
-# License located at http://tmate.org/svn/license.html
-License:        TMate
+# License located at http://svnkit.com/license.html
+License:        TMate License and ASL 1.1
 URL:            http://www.svnkit.com/
-Source0:        http://www.svnkit.com/org.tmatesoft.svn_%{version}.src.zip
+# original source located at: http://www.svnkit.com/org.tmatesoft.svn_%{version}.src.zip
+# repackaged removing binary dependencies using:
+# zip $FILE -d \*.jar
+Source0:        org.tmatesoft.svn_%{version}.src-CLEAN.zip
+Patch0:         svnkit-1.2.2-dependencies.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ant
-BuildRequires:  jpackage-utils >= 0:1.6
-%if %{gcj_support}
-BuildRequires:          gcc-java >= 4.0.2
-BuildRequires:          java-gcj-compat-devel >= 1.0.33
-Requires(post):         java-gcj-compat >= 1.0.33
-Requires(postun):       java-gcj-compat >= 1.0.33
-%else
-BuildRequires:          java-devel >= 1.4.2
-%endif
-
-%if %{gcj_support}
-#ExclusiveArch:          %{ix86} x86_64 ppc ia64
-%else
-BuildArch:              noarch
-%endif
+BuildArch:      noarch
 
-BuildRequires:          ganymed-ssh2 >= 209
-Requires:               ganymed-ssh2 >= 209
+BuildRequires:          ant
+BuildRequires:          jpackage-utils >= 0:1.6
+BuildRequires:          eclipse-pde
+Requires:               eclipse-platform
+
+BuildRequires:          subversion-javahl >= 1.5
+Requires:               subversion-javahl >= 1.5
+BuildRequires:          jna >= 3.0
+BuildRequires:          trilead-ssh2 >= 213
+Requires:               jna >= 3.0
+Requires:               trilead-ssh2 >= 213
 Obsoletes:              javasvn <= 1.1.0
 
 
@@ -49,13 +58,39 @@
 %description javadoc
 Javadoc for SVNKit - Java Subversion client library.
 
+%package -n eclipse-svnkit
+Summary:        Eclipse feature for SVNKit
+Group:          Development/Tools
+Requires:       svnkit = %{version}
+
+%description -n eclipse-svnkit
+Eclipse feature for SVNKit - Java Subversion client library.
+
 
 %prep
-%setup -q -n %{name}-src-%{version}
+%setup -q -n %{name}-src-%{version}.%{svn_revision}
+%patch0 -p1
+
 # delete the jars that are in the archive
-rm contrib/ganymed/ganymed.jar
-ln -sf %{_javadir}/ganymed-ssh2.jar contrib/ganymed/ganymed.jar
-rm contrib/junit/junit.jar
+JAR_files=""
+for j in $(find -name \*.jar); do
+if [ ! -L $j ] ; then
+JAR_files="$JAR_files $j"
+fi
+done
+if [ ! -z "$JAR_files" ] ; then
+echo "These JAR files should be deleted and symlinked to system JAR files: $JAR_files"
+exit 1
+fi
+find contrib -name \*.jar -exec rm {} \;
+
+# delete src packages for dependencies
+rm contrib/trilead/trileadsrc.zip
+
+# relinking dependencies
+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
 
 # fixing wrong-file-end-of-line-encoding warnings
 sed -i 's/\r//' README.txt doc/javadoc/package-list
@@ -63,14 +98,7 @@
 
 
 %build
-ant build-library
-
-# Link source files to fix -debuginfo generation.
-#rm -f org
-#ln -s javasvn/src/org
-#rm -f de
-#ln -s contrib/sequence/src/de
-
+ECLIPSE_HOME=%{eclipse_base} ant
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -85,32 +113,46 @@
 cp -pr doc/javadoc/* \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-# gcj support
-%if %{gcj_support}
-  aot-compile-rpm
-%endif
+# eclipse
+mkdir -p $RPM_BUILD_ROOT%{local_dropins}
+cp -R build/eclipse/features $RPM_BUILD_ROOT%{local_dropins}
+
+# extracting plugin jars
+mkdir $RPM_BUILD_ROOT%{local_plugins}
+unzip build/eclipse/site/plugins/%{jna_plugin_name}.jar -d $RPM_BUILD_ROOT%{jna_plugin_dir}
+unzip build/eclipse/site/plugins/%{core_plugin_name}.jar -d $RPM_BUILD_ROOT%{core_plugin_dir}
+ 
+# 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}
 
+# main library links
 pushd $RPM_BUILD_ROOT%{_javadir}/
 ln -s %{name}-%{version}.jar %{name}.jar
 ln -s %{name}-javahl-%{version}.jar %{name}-javahl.jar
 popd
 
+# We need to setup the symlink because the ant copy task doesn't preserve symlinks
+# TODO file a bug about this
+ln -s %{_javadir}/svn-javahl.jar $RPM_BUILD_ROOT%{core_plugin_dir}
+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}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
 
 %files
 %defattr(-,root,root)
 %{_javadir}/*
 %doc README.txt changelog.txt
 
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
+
+%files -n eclipse-svnkit
+%{install_loc}/svnkit
+
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -118,6 +160,14 @@
 
 
 %changelog
+* Mon Mar 23 2009 Robert Marcano <robert at marcanoonline.com> - 1.2.3-1
+- Update to upstream 1.2.3
+
+* Tue Feb 17 2009 Robert Marcano <robert at marcanoonline.com> - 1.2.2-1
+- Update to upstream 1.2.2
+- New eclipse-svnkit subpackage with eclipse plugin
+- GCJ AOT removed
+
 * Sun Sep  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.4-4
 - fix license tag

More information about the fedora-extras-commits mailing list