rpms/eclipse-subclipse/F-7 eclipse-subclipse-1.2.2-default-svnkit.patch, NONE, 1.1 eclipse-subclipse-1.2.2-plugin-classpath.patch, NONE, 1.1 subclipse-fetch-1.2.2.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 eclipse-subclipse.spec, 1.4, 1.5 sources, 1.4, 1.5 eclipse-subclipse-1.1.9-default-javasvn.patch, 1.1, NONE eclipse-subclipse-1.1.9-plugin-classpath.patch, 1.1, NONE subclipse-fetch-1.1.9.sh, 1.1, NONE
Robert Marcano (robmv)
fedora-extras-commits at redhat.com
Wed Jun 20 16:03:19 UTC 2007
Author: robmv
Update of /cvs/extras/rpms/eclipse-subclipse/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16195
Modified Files:
.cvsignore eclipse-subclipse.spec sources
Added Files:
eclipse-subclipse-1.2.2-default-svnkit.patch
eclipse-subclipse-1.2.2-plugin-classpath.patch
subclipse-fetch-1.2.2.sh
Removed Files:
eclipse-subclipse-1.1.9-default-javasvn.patch
eclipse-subclipse-1.1.9-plugin-classpath.patch
subclipse-fetch-1.1.9.sh
Log Message:
- Update to upstream 1.2.2
- Dependency changed from javasvn to svnkit
- Patch to support EPEL5 sent by Rob Myers
eclipse-subclipse-1.2.2-default-svnkit.patch:
--- NEW FILE eclipse-subclipse-1.2.2-default-svnkit.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.2.2-plugin-classpath.patch:
--- NEW FILE eclipse-subclipse-1.2.2-plugin-classpath.patch ---
diff -Naur subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF
--- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF 2006-10-23 13:10:29.000000000 -0400
+++ subclipse-1.2.2/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.2.2
-Bundle-ClassPath: .,
+Bundle-ClassPath: lib/subclipse-core.jar,
lib/svnClientAdapter.jar,
lib/svnjavahl.jar,
lib/svnkit.jar,
--- NEW FILE subclipse-fetch-1.2.2.sh ---
#!/bin/sh
VERSION=1.2.2
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/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 21 Dec 2006 13:32:47 -0000 1.4
+++ .cvsignore 20 Jun 2007 16:02:39 -0000 1.5
@@ -1 +1 @@
-subclipse-1.1.9.tgz
+subclipse-1.2.2.tgz
Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/eclipse-subclipse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-subclipse.spec 21 Dec 2006 13:32:47 -0000 1.4
+++ eclipse-subclipse.spec 20 Jun 2007 16:02:39 -0000 1.5
@@ -5,9 +5,17 @@
%define core_plugin_jar %{eclipse_base}/plugins/org.tigris.subversion.subclipse.core_%{version}.jar
%define core_plugin_dir %{eclipse_base}/plugins/org.tigris.subversion.subclipse.core_%{version}
+%define disable_javahl 0
+%if 0%{?fedora} == 6
+%define disable_javahl 1
+%endif
+%if 0%{?rhel} == 5
+%define disable_javahl 1
+%endif
+
Name: eclipse-subclipse
-Version: 1.1.9
+Version: 1.2.2
Release: 2%{?dist}
Summary: Subversion Eclipse plugin
@@ -18,14 +26,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.9.sh
+Source10: subclipse-fetch-1.2.2.sh
# Disable javahl support temporaly until apparent classloader problem is fixed
-Patch0: eclipse-subclipse-1.1.9-default-javasvn.patch
+Patch0: eclipse-subclipse-1.2.2-default-svnkit.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.9-plugin-classpath.patch
+Source50: eclipse-subclipse-1.2.2-plugin-classpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
@@ -51,8 +59,8 @@
BuildRequires: subversion-javahl >= 1.3.1
Requires: subversion-javahl >= 1.3.1
-BuildRequires: javasvn >= 1.1.0
-Requires: javasvn >= 1.1.0
+BuildRequires: svnkit >= 1.1.2
+Requires: svnkit >= 1.1.2
BuildRequires: ganymed-ssh2 >= 209
Requires: ganymed-ssh2 >= 209
@@ -72,13 +80,15 @@
%prep
%setup -q -n subclipse-%{version}
+%if 0%{disable_javahl}
%patch -p1
+%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
+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
@@ -86,8 +96,8 @@
ln -sf %{_libdir}/svn-javahl/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
@@ -106,7 +116,12 @@
# building subclipse
pushd subclipse
# See comments in the script to understand this.
+# RHEL eclipse has a different instalation root
+%if 0%{?rhel} == 5
+/bin/sh -x %{_libdir}/%{eclipse_name}/buildscripts/copy-platform SDK %{eclipse_base}
+%else
/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
+%endif
SDK=$(cd SDK > /dev/null && pwd)
# Eclipse may try to write to the home directory.
@@ -187,7 +202,7 @@
# 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}
@@ -197,7 +212,7 @@
# 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}/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
@@ -227,6 +242,11 @@
%{eclipse_base}/plugins/org.tigris.subversion.book_*
%changelog
+* Wed Jun 20 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-2
+- Update to upstream 1.2.2
+- Dependency changed from javasvn to svnkit
+- Patch to support EPEL5 sent by Rob Myers
+
* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 21 Dec 2006 13:32:47 -0000 1.4
+++ sources 20 Jun 2007 16:02:39 -0000 1.5
@@ -1 +1 @@
-aba44eb41923745925b0a16ccf83f45b subclipse-1.1.9.tgz
+b58870a0a4ec9c5cacf3830bc3179961 subclipse-1.2.2.tgz
--- eclipse-subclipse-1.1.9-default-javasvn.patch DELETED ---
--- eclipse-subclipse-1.1.9-plugin-classpath.patch DELETED ---
--- subclipse-fetch-1.1.9.sh DELETED ---
More information about the fedora-extras-commits
mailing list