diff --git a/.cvsignore b/.cvsignore index 926fac1..03958b4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -subclipse-1.1.8.tgz +subclipse-1.1.9.tgz diff --git a/eclipse-subclipse-1.0.1-default-javasvn.patch b/eclipse-subclipse-1.0.1-default-javasvn.patch deleted file mode 100644 index 21bb42b..0000000 --- a/eclipse-subclipse-1.0.1-default-javasvn.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur subclipse-1.0.1.original/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java subclipse-1.0.1/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java ---- subclipse-1.0.1.original/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java 2006-04-27 21:24:32.000000000 -0400 -+++ subclipse-1.0.1/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java 2006-04-27 22:18:30.000000000 -0400 -@@ -51,9 +51,8 @@ - */ - public void setSvnClientInterface(String svnClientInterface) { - if (svnClientInterface == null) { -- // if no specific interface is specified, load JavaHL -- // if JavaHL fails to load, then JavaSVN will load -- loadJavaHLAdapter(); -+ // if no specific interface is specified, load JavaSVN -+ loadJavaSVNAdapter(); - try { - this.svnClientInterface = SVNClientAdapterFactory.getPreferredSVNClientType(); - } catch (SVNClientException e) { -@@ -135,7 +134,8 @@ - } - - public void loadAdapters() { -- loadJavaHLAdapter(); -+ // disabling until classloader bug fix is available -+// loadJavaHLAdapter(); - loadJavaSVNAdapter(); - } - -diff -Naur subclipse-1.0.1.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java subclipse-1.0.1/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java ---- subclipse-1.0.1.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java 2006-04-27 21:24:32.000000000 -0400 -+++ subclipse-1.0.1/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java 2006-04-27 22:25:39.000000000 -0400 -@@ -157,7 +157,9 @@ - group.setLayoutData(gridData); - layout = new GridLayout(); - group.setLayout(layout); -- javahlRadio = createRadio(group, Policy.bind("SVNPreferencePage.svnjavahl"),1); //$NON-NLS-1$ -+ // setting disabled until classloader problem is fixed -+ javahlRadio = createRadio(group, Policy.bind("SVNPreferencePage.svnjavahl") + " - Disabled until bug is fixed",1); //$NON-NLS-1$ -+ javahlRadio.setEnabled(false); - javaSvnRadio = createRadio(group, Policy.bind("SVNPreferencePage.javasvn"),1); //$NON-NLS-1$ - Listener checkInterfaceListener = new Listener() { - public void handleEvent(Event event) { -diff -Naur subclipse-1.0.1.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java subclipse-1.0.1/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java ---- subclipse-1.0.1.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java 2006-04-27 21:24:32.000000000 -0400 -+++ subclipse-1.0.1/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java 2006-04-27 21:47:40.000000000 -0400 -@@ -74,7 +74,7 @@ - store.setDefault(ISVNUIConstants.PREF_SHOW_COMPARE_REVISION_IN_DIALOG, false); - store.setDefault(ISVNUIConstants.PREF_SELECT_UNADDED_RESOURCES_ON_COMMIT, false); - -- store.setDefault(ISVNUIConstants.PREF_SVNINTERFACE, JhlClientAdapterFactory.JAVAHL_CLIENT); -+ store.setDefault(ISVNUIConstants.PREF_SVNINTERFACE, JavaSvnClientAdapterFactory.JAVASVN_CLIENT); - store.setDefault(ISVNUIConstants.PREF_SVNCONFIGDIR, ""); //$NON-NLS-1$ - - store.setDefault(ISVNUIConstants.PREF_FETCH_CHANGE_PATH_ON_DEMAND, false); diff --git a/eclipse-subclipse-1.1.8-plugin-classpath.patch b/eclipse-subclipse-1.1.8-plugin-classpath.patch deleted file mode 100644 index 3315ee1..0000000 --- a/eclipse-subclipse-1.1.8-plugin-classpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF ---- subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF 2006-10-23 13:10:29.000000000 -0400 -+++ subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF 2006-11-08 07:16:12.000000000 -0400 -@@ -2,7 +2,7 @@ - Bundle-Name: %pluginName - Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true - Bundle-Version: 1.1.8 --Bundle-ClassPath: ., -+Bundle-ClassPath: lib/subclipse-core.jar, - lib/svnClientAdapter.jar, - lib/svnjavahl.jar, - lib/javasvn.jar, diff --git a/eclipse-subclipse-1.1.9-default-javasvn.patch b/eclipse-subclipse-1.1.9-default-javasvn.patch new file mode 100644 index 0000000..c95a2ee --- /dev/null +++ b/eclipse-subclipse-1.1.9-default-javasvn.patch @@ -0,0 +1,50 @@ +diff -Naur subclipse-1.1.9.original/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java subclipse-1.1.9/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java +--- subclipse-1.1.9.original/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java 2006-11-16 16:31:30.000000000 -0400 ++++ subclipse-1.1.9/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java 2006-12-21 08:21:36.000000000 -0400 +@@ -52,9 +52,8 @@ + */ + public void setSvnClientInterface(String svnClientInterface) { + if (svnClientInterface == null) { +- // if no specific interface is specified, load JavaHL +- // if JavaHL fails to load, then JavaSVN will load +- loadJavaHLAdapter(); ++ // if no specific interface is specified, load JavaSVN ++ loadSVNKitAdapter(); + try { + this.svnClientInterface = SVNClientAdapterFactory.getPreferredSVNClientType(); + } catch (SVNClientException e) { +@@ -138,7 +137,8 @@ + } + + public void loadAdapters() { +- loadJavaHLAdapter(); ++ // disabling until classloader bug fix is available ++ // loadJavaHLAdapter(); + loadSVNKitAdapter(); + } + +diff -Naur subclipse-1.1.9.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java subclipse-1.1.9/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java +--- subclipse-1.1.9.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java 2006-11-16 16:31:30.000000000 -0400 ++++ subclipse-1.1.9/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java 2006-12-21 08:23:40.000000000 -0400 +@@ -177,7 +177,9 @@ + group.setLayoutData(gridData); + layout = new GridLayout(); + group.setLayout(layout); ++ // setting disabled until classloader problem is fixed + javahlRadio = createRadio(group, Policy.bind("SVNPreferencePage.svnjavahl"),1); //$NON-NLS-1$ ++ javahlRadio.setEnabled(false); + svnKitRadio = createRadio(group, Policy.bind("SVNPreferencePage.javasvn"),1); //$NON-NLS-1$ + Listener checkInterfaceListener = new Listener() { + public void handleEvent(Event event) { +diff -Naur subclipse-1.1.9.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java subclipse-1.1.9/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java +--- subclipse-1.1.9.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java 2006-11-16 16:31:30.000000000 -0400 ++++ subclipse-1.1.9/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java 2006-12-21 08:19:46.000000000 -0400 +@@ -81,7 +81,7 @@ + store.setDefault(ISVNUIConstants.PREF_REMOVE_UNADDED_RESOURCES_ON_REPLACE, true); + store.setDefault(ISVNUIConstants.PREF_COMMIT_SET_DEFAULT_ENABLEMENT, false); + +- store.setDefault(ISVNUIConstants.PREF_SVNINTERFACE, JhlClientAdapterFactory.JAVAHL_CLIENT); ++ store.setDefault(ISVNUIConstants.PREF_SVNINTERFACE, SvnKitClientAdapterFactory.SVNKIT_CLIENT); + store.setDefault(ISVNUIConstants.PREF_SVNCONFIGDIR, ""); //$NON-NLS-1$ + + store.setDefault(ISVNUIConstants.PREF_FETCH_CHANGE_PATH_ON_DEMAND, false); diff --git a/eclipse-subclipse-1.1.9-plugin-classpath.patch b/eclipse-subclipse-1.1.9-plugin-classpath.patch new file mode 100644 index 0000000..def806a --- /dev/null +++ b/eclipse-subclipse-1.1.9-plugin-classpath.patch @@ -0,0 +1,12 @@ +diff -Naur subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF +--- subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF 2006-10-23 13:10:29.000000000 -0400 ++++ subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF 2006-11-08 07:16:12.000000000 -0400 +@@ -2,7 +2,7 @@ + Bundle-Name: %pluginName + Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true + Bundle-Version: 1.1.9 +-Bundle-ClassPath: ., ++Bundle-ClassPath: lib/subclipse-core.jar, + lib/svnClientAdapter.jar, + lib/svnjavahl.jar, + lib/javasvn.jar, diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec index 5b3c144..1f5ffcc 100644 --- a/eclipse-subclipse.spec +++ b/eclipse-subclipse.spec @@ -7,7 +7,7 @@ Name: eclipse-subclipse -Version: 1.1.8 +Version: 1.1.9 Release: 2%{?dist} Summary: Subversion Eclipse plugin @@ -18,15 +18,14 @@ Source0: subclipse-%{version}.tgz # 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.8.sh +Source10: subclipse-fetch-1.1.9.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 +Patch0: eclipse-subclipse-1.1.9-default-javasvn.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.8-plugin-classpath.patch +Source50: eclipse-subclipse-1.1.9-plugin-classpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -74,7 +73,6 @@ The Subversion book as an Eclipse documentation plugin. %prep %setup -q -n subclipse-%{version} %patch -p1 -%patch1 -p1 # delete the jars that are in the archive rm svnClientAdapter/lib/svnjavahl.jar @@ -116,28 +114,46 @@ mkdir home homedir=$(cd home > /dev/null && pwd) # build the main subclipse feature -java -cp %{eclipse_base}/startup.jar \ - -Duser.home=$homedir \ - org.eclipse.core.launcher.Main \ +eclipse \ -application org.eclipse.ant.core.antRunner \ + -Duser.home=$homedir \ -Dtype=feature \ -Did=org.tigris.subversion.subclipse \ -DsourceDirectory=$(pwd) \ -DbaseLocation=$SDK \ -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml +#java -cp %{eclipse_base}/startup.jar \ +# -Duser.home=$homedir \ +# org.eclipse.core.launcher.Main \ +# -application org.eclipse.ant.core.antRunner \ +# -Dtype=feature \ +# -Did=org.tigris.subversion.subclipse \ +# -DsourceDirectory=$(pwd) \ +# -DbaseLocation=$SDK \ +# -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ +# -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml # build the subclipse book feature -java -cp %{eclipse_base}/startup.jar \ - -Duser.home=$homedir \ - org.eclipse.core.launcher.Main \ +eclipse \ -application org.eclipse.ant.core.antRunner \ + -Duser.home=$homedir \ -Dtype=feature \ -Did=org.tigris.subversion.book \ -DsourceDirectory=$(pwd) \ -DbaseLocation=$SDK \ -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml +#java -cp %{eclipse_base}/startup.jar \ +# -Duser.home=$homedir \ +# org.eclipse.core.launcher.Main \ +# -application org.eclipse.ant.core.antRunner \ +# -Dtype=feature \ +# -Did=org.tigris.subversion.book \ +# -DsourceDirectory=$(pwd) \ +# -DbaseLocation=$SDK \ +# -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ +# -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml # returning to base build directory popd @@ -211,6 +227,11 @@ rm -rf $RPM_BUILD_ROOT %{eclipse_base}/plugins/org.tigris.subversion.book_* %changelog +* Thu Dec 21 2006 Robert Marcano 1.1.9-2 +- Update to upstream 1.1.9 +- Removed patch that added source attribute to the javac ant task +- Using the "eclipse" launcher + * Wed Nov 08 2006 Robert Marcano 1.1.8-2 - Update to upstream 1.1.8 diff --git a/sources b/sources index ac92aa9..e21a9cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bbc6dd6c7cb8107fe3906460b2f556e4 subclipse-1.1.8.tgz +aba44eb41923745925b0a16ccf83f45b subclipse-1.1.9.tgz diff --git a/subclipse-fetch-1.1.8.sh b/subclipse-fetch-1.1.8.sh deleted file mode 100644 index 97517a2..0000000 --- a/subclipse-fetch-1.1.8.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -VERSION=1.1.8 -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 -czf subclipse-$VERSION.tgz subclipse-$VERSION diff --git a/subclipse-fetch-1.1.9.sh b/subclipse-fetch-1.1.9.sh new file mode 100644 index 0000000..0d5dc43 --- /dev/null +++ b/subclipse-fetch-1.1.9.sh @@ -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 -czf subclipse-$VERSION.tgz subclipse-$VERSION diff --git a/svnClientAdapter-1.1.4-javac-target.patch b/svnClientAdapter-1.1.4-javac-target.patch deleted file mode 100644 index 42bb34e..0000000 --- a/svnClientAdapter-1.1.4-javac-target.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur subclipse-1.1.4.original/svnClientAdapter/build.xml subclipse-1.1.4/svnClientAdapter/build.xml ---- subclipse-1.1.4.original/svnClientAdapter/build.xml 2006-07-23 16:41:55.000000000 -0400 -+++ subclipse-1.1.4/svnClientAdapter/build.xml 2006-07-31 07:42:32.000000000 -0400 -@@ -33,6 +33,7 @@ - destdir="${build.classes.dir}" - debug="${debug}" - target="${targetJvm}" -+ source="${targetJvm}" - includes="**" - classpathref="project.classpath"> -