[eclipse-subclipse] Update to recent upstream (1.8.20).
Krzysztof Daniel
kdaniel at fedoraproject.org
Fri May 3 11:50:47 UTC 2013
commit 1b3f798355e7c99ddc822df0ad67d64234647800
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri May 3 11:46:27 2013 +0200
Update to recent upstream (1.8.20).
eclipse-subclipse-1.8.13-dependencies.patch | 2 +-
eclipse-subclipse.spec | 22 +++++++++++++++-------
sources | 2 +-
subclipse-fetch.sh | 2 +-
4 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/eclipse-subclipse-1.8.13-dependencies.patch b/eclipse-subclipse-1.8.13-dependencies.patch
index 66b9984..2bfd046 100644
--- a/eclipse-subclipse-1.8.13-dependencies.patch
+++ b/eclipse-subclipse-1.8.13-dependencies.patch
@@ -45,7 +45,7 @@ index ed6b62e..65be0be 100644
@@ -7,6 +7,8 @@ Bundle-Activator: org.tigris.subversion.clientadapter.javahl.Activator
Bundle-Vendor: tigris.org
Require-Bundle: org.eclipse.core.runtime,
- org.tigris.subversion.clientadapter;bundle-version="[1.8.1,1.9.0)"
+ org.tigris.subversion.clientadapter;bundle-version="[1.8.4,1.9.0)"
+Bundle-ClassPath: clientadapter-javahl.jar,
+ svn-javahl.jar
Eclipse-LazyStart: true
diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec
index c98c3f3..f06d993 100644
--- a/eclipse-subclipse.spec
+++ b/eclipse-subclipse.spec
@@ -1,14 +1,14 @@
%global eclipse_name eclipse
%global eclipse_base %{_libdir}/%{eclipse_name}
%global install_loc %{_datadir}/eclipse/dropins
-%global javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.7.6.jar
+%global javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.7.9.1
# Add a comment to have something to commit to try to reproduce Adam
# Williamson's deadlock bug.
Name: eclipse-subclipse
-Version: 1.8.16
-Release: 2%{?dist}
+Version: 1.8.20
+Release: 1%{?dist}
Summary: Subversion Eclipse plugin
Group: Development/Tools
@@ -28,8 +28,8 @@ BuildRequires: eclipse-pde >= 4.2.0-0.6
BuildRequires: eclipse-gef
Requires: eclipse-platform >= 4.2.0-0.6
-BuildRequires: subversion-javahl >= 1.7
-Requires: subversion-javahl >= 1.7
+BuildRequires: subversion-javahl >= 1.7.9
+Requires: subversion-javahl >= 1.7.9
Obsoletes: eclipse-subclipse-book < 1.4
@@ -89,8 +89,13 @@ install -d -m 755 $installBase/subclipse-graph
unzip -q -d $installBase/subclipse-graph build/rpmBuild/org.tigris.subversion.subclipse.graph.feature.zip
# replacing jar with links to system libraries
-rm $installBase/subclipse-clientadapter-javahl/eclipse/plugins/%{javahl_plugin_name}
-ln -s %{_javadir}/svn-javahl.jar $installBase/subclipse-clientadapter-javahl/eclipse/plugins/%{javahl_plugin_name}
+pushd $installBase/subclipse-clientadapter-javahl/eclipse/plugins/
+unzip %{javahl_plugin_name}.jar -d %{javahl_plugin_name}
+rm %{javahl_plugin_name}.jar
+cd %{javahl_plugin_name}
+rm svn-javahl.jar
+ln -s %{_javadir}/svn-javahl.jar
+popd
%files
%{install_loc}/subclipse
@@ -102,6 +107,9 @@ ln -s %{_javadir}/svn-javahl.jar $installBase/subclipse-clientadapter-javahl/ecl
%changelog
+* Fri May 3 2013 Krzysztof Daniel <kdaniel at redhat.com> 1.8.20-1
+- Update to latest upstream release.
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index d6ff5dd..bcdd6e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-decc16e60ef3bf73a7f7b25ad4d06308 subclipse-1.8.16.tar.xz
+5f68ef052039475bb89725fb738289ed subclipse-1.8.20.tar.xz
diff --git a/subclipse-fetch.sh b/subclipse-fetch.sh
index 261f3c7..0158627 100755
--- a/subclipse-fetch.sh
+++ b/subclipse-fetch.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-VERSION=1.8.16
+VERSION=1.8.20
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION/subclipse subclipse-$VERSION
rm -rf ./subclipse-$VERSION/org.tigris.subversion.clientadapter.javahl.win*
tar -caf subclipse-$VERSION.tar.xz subclipse-$VERSION
More information about the scm-commits
mailing list