Author: walluck Date: Mon Dec 18 10:37:04 2006 New Revision: 98392 Added: packages/cooker/eclipse-subclipse/current/SOURCES/subclipse-1.1.9.tar.bz2 (contents, props changed) packages/cooker/eclipse-subclipse/current/SOURCES/subclipse-fetch-1.1.9.sh (contents, props changed) Removed: packages/cooker/eclipse-subclipse/current/SOURCES/eclipse-subclipse-1.0.1-default-javasvn.patch packages/cooker/eclipse-subclipse/current/SOURCES/eclipse-subclipse-1.1.5-plugin-classpath.patch packages/cooker/eclipse-subclipse/current/SOURCES/subclipse-1.1.5.tar.bz2 packages/cooker/eclipse-subclipse/current/SOURCES/subclipse-fetch-1.1.5.sh packages/cooker/eclipse-subclipse/current/SOURCES/svnClientAdapter-1.1.4-javac-target.patch Modified: packages/cooker/eclipse-subclipse/current/SPECS/eclipse-subclipse.spec
Log: 1.1.9 Added: packages/cooker/eclipse-subclipse/current/SOURCES/subclipse-1.1.9.tar.bz2 ============================================================================== Binary file. No diff available. Added: packages/cooker/eclipse-subclipse/current/SOURCES/subclipse-fetch-1.1.9.sh ============================================================================== --- (empty file) +++ packages/cooker/eclipse-subclipse/current/SOURCES/subclipse-fetch-1.1.9.sh Mon Dec 18 10:37:04 2006 @@ -0,0 +1,6 @@ +#!/bin/sh +VERSION=1.1.9 +svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION +find $VERSION -name \*.dll | xargs rm +mv $VERSION subclipse-$VERSION +tar -cjf subclipse-$VERSION.tar.bz2 subclipse-$VERSION Modified: packages/cooker/eclipse-subclipse/current/SPECS/eclipse-subclipse.spec ============================================================================== --- packages/cooker/eclipse-subclipse/current/SPECS/eclipse-subclipse.spec (original) +++ packages/cooker/eclipse-subclipse/current/SPECS/eclipse-subclipse.spec Mon Dec 18 10:37:04 2006 @@ -7,11 +7,10 @@ Name: eclipse-subclipse -Version: 1.1.5 -Release: %mkrel 2 +Version: 1.1.9 +Release: %mkrel 1 Epoch: 0 Summary: Subversion Eclipse plugin - Group: Development/Java License: EPL URL: http://subclipse.tigris.org/ @@ -19,19 +18,10 @@ # Script to fetch the source code # the new source tarball does not includes the book feature and the layout is # different than the source repository -Source10: subclipse-fetch-1.1.5.sh -# Disable javahl support temporaly until apparent classloader problem is fixed -Patch0: eclipse-subclipse-1.0.1-default-javasvn.patch -Patch1: svnClientAdapter-1.1.4-javac-target.patch - -# This patch is applied after the build has finished when unpacking the plugin -# jar and replacing internal jars with links to its dependencies. It can not be -# applied at "prep" stage because it causes errors at build time -Source50: eclipse-subclipse-1.1.5-plugin-classpath.patch +Source10: subclipse-fetch-1.1.9.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - BuildRequires: ant -BuildRequires: jpackage-utils >= 0:1.6 +BuildRequires: jpackage-utils BuildRequires: coreutils BuildRequires: eclipse-pde %if %{gcj_support} @@ -41,28 +31,24 @@ %else BuildRequires: java-devel >= 0:1.4.2 %endif - %if %{gcj_support} ExclusiveArch: %{ix86} x86_64 ppc ia64 %else BuildArch: noarch %endif - Requires: eclipse-platform - -BuildRequires: java-svn >= 0:1.3.1 -Requires: java-svn >= 0:1.3.1 -BuildRequires: javasvn >= 0:1.1.0 -Requires: javasvn >= 0:1.1.0 -BuildRequires: ganymed-ssh2 >= 0:209 -Requires: ganymed-ssh2 >= 0:209 +BuildRequires: svn-javahl +Requires: svn-javahl +BuildRequires: svnkit +Requires: svnkit +BuildRequires: ganymed-ssh2 +Requires: ganymed-ssh2 %package book Summary: Subversion book Group: Development/Java Requires: %{name} = %{version}-%{release} - %description Subclipse is an Eclipse plugin that adds Subversion integration to the Eclipse IDE. @@ -70,35 +56,35 @@ %description book The Subversion book as an Eclipse documentation plugin. - %prep %setup -q -n subclipse-%{version} -%patch -p1 -%patch1 -p1 +%if 0 +%{__perl} -pi -e 's/JhlClientAdapterFactory\.JAVAHL_CLIENT/SvnKitClientAdapterFactory.SVNKIT_CLIENT/' \ + subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java +%endif # delete the jars that are in the archive rm svnClientAdapter/lib/svnjavahl.jar -ln -sf %{_libdir}/svn-javahl/svn-javahl.jar svnClientAdapter/lib/svnjavahl.jar -rm -f svnClientAdapter/lib/javasvn.jar -ln -sf %{_javadir}/javasvn.jar svnClientAdapter/lib/javasvn.jar +ln -sf %{_javadir}/svn-javahl.jar svnClientAdapter/lib/svnjavahl.jar +rm -f svnClientAdapter/lib/svnkit.jar +ln -sf %{_javadir}/svnkit.jar svnClientAdapter/lib/svnkit.jar rm -f svnClientAdapter/lib/ganymed.jar ln -sf %{_javadir}/ganymed-ssh2.jar svnClientAdapter/lib/ganymed.jar rm -f subclipse/core/lib/svnjavahl.jar -ln -sf %{_libdir}/svn-javahl/svn-javahl.jar subclipse/core/lib/svnjavahl.jar +ln -sf %{_javadir}/svn-javahl.jar subclipse/core/lib/svnjavahl.jar rm -f subclipse/core/lib/svnClientAdapter.jar # svnClientAdapter.jar is copied after being built -rm -f subclipse/core/lib/javasvn.jar -ln -sf %{_javadir}/javasvn.jar subclipse/core/lib/javasvn.jar +rm -f subclipse/core/lib/svnkit.jar +ln -sf %{_javadir}/svnkit.jar subclipse/core/lib/svnkit.jar rm -f subclipse/core/lib/ganymed.jar ln -sf %{_javadir}/ganymed-ssh2.jar subclipse/core/lib/ganymed.jar - %build # --------------------------------- # building svnClientAdapter pushd svnClientAdapter -%ant svnClientAdapter.jar +%{ant} svnClientAdapter.jar popd # copying svnClientAdapter inside subclipse module @@ -167,11 +153,11 @@ jar -cf $RPM_BUILD_ROOT%{core_plugin_dir}/lib/subclipse-core.jar -C $RPM_BUILD_ROOT%{core_plugin_dir} org rm -rf $RPM_BUILD_ROOT%{core_plugin_dir}/org # adding the recently created jar to the plugin manifestOB -patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50} +%{__perl} -pi -e 's|^Bundle-ClassPath: \.|Bundle-ClassPath: lib/subclipse-core.jar|' $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF # removing core plugin internal jars rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar -rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/javasvn.jar +rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnkit.jar rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/ganymed.jar %if %{gcj_support} @@ -180,11 +166,10 @@ # We need to setup the symlink because the ant copy task doesn't preserve symlinks # TODO file a bug about this -ln -s %{_libdir}/svn-javahl/svn-javahl.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar -ln -s %{_javadir}/javasvn.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/javasvn.jar +ln -s %{_javadir}/svn-javahl.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar +ln -s %{_javadir}/svnkit.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnkit.jar ln -s %{_javadir}/ganymed-ssh2.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/ganymed.jar - %clean rm -rf $RPM_BUILD_ROOT
