rpms/eclipse-subclipse/devel eclipse-subclipse-1.1.9-default-javasvn.patch, NONE, 1.1 eclipse-subclipse-1.1.9-plugin-classpath.patch, NONE, 1.1 subclipse-fetch-1.1.9.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 eclipse-subclipse.spec, 1.3, 1.4 sources, 1.3, 1.4 eclipse-subclipse-1.0.1-default-javasvn.patch, 1.1, NONE eclipse-subclipse-1.1.8-plugin-classpath.patch, 1.1, NONE subclipse-fetch-1.1.8.sh, 1.1, NONE svnClientAdapter-1.1.4-javac-target.patch, 1.1, NONE
Robert Marcano (robmv)
fedora-extras-commits at redhat.com
Thu Dec 21 13:33:17 UTC 2006
Author: robmv
Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27646
Modified Files:
.cvsignore eclipse-subclipse.spec sources
Added Files:
eclipse-subclipse-1.1.9-default-javasvn.patch
eclipse-subclipse-1.1.9-plugin-classpath.patch
subclipse-fetch-1.1.9.sh
Removed Files:
eclipse-subclipse-1.0.1-default-javasvn.patch
eclipse-subclipse-1.1.8-plugin-classpath.patch
subclipse-fetch-1.1.8.sh
svnClientAdapter-1.1.4-javac-target.patch
Log Message:
Update to upstream 1.1.9
eclipse-subclipse-1.1.9-default-javasvn.patch:
--- NEW FILE eclipse-subclipse-1.1.9-default-javasvn.patch ---
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);
eclipse-subclipse-1.1.9-plugin-classpath.patch:
--- NEW FILE eclipse-subclipse-1.1.9-plugin-classpath.patch ---
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,
--- NEW FILE subclipse-fetch-1.1.9.sh ---
#!/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
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2006 11:36:57 -0000 1.3
+++ .cvsignore 21 Dec 2006 13:32:47 -0000 1.4
@@ -1 +1 @@
-subclipse-1.1.8.tgz
+subclipse-1.1.9.tgz
Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-subclipse.spec 8 Nov 2006 11:36:57 -0000 1.3
+++ eclipse-subclipse.spec 21 Dec 2006 13:32:47 -0000 1.4
@@ -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 @@
# 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 @@
%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 @@
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 @@
%{eclipse_base}/plugins/org.tigris.subversion.book_*
%changelog
+* Thu Dec 21 2006 Robert Marcano <robert at marcanoonline.com> 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 <robert at marcanoonline.com> 1.1.8-2
- Update to upstream 1.1.8
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2006 11:36:57 -0000 1.3
+++ sources 21 Dec 2006 13:32:47 -0000 1.4
@@ -1 +1 @@
-bbc6dd6c7cb8107fe3906460b2f556e4 subclipse-1.1.8.tgz
+aba44eb41923745925b0a16ccf83f45b subclipse-1.1.9.tgz
--- eclipse-subclipse-1.0.1-default-javasvn.patch DELETED ---
--- eclipse-subclipse-1.1.8-plugin-classpath.patch DELETED ---
--- subclipse-fetch-1.1.8.sh DELETED ---
--- svnClientAdapter-1.1.4-javac-target.patch DELETED ---
More information about the scm-commits
mailing list