[eclipse-subclipse/f18] Update to release 1.8.16
swagiaal
swagiaal at fedoraproject.org
Fri Oct 12 17:51:28 UTC 2012
commit 25ec0cf82eb9c92dab4b802c680f19386e864f30
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date: Thu Oct 11 16:12:09 2012 -0400
Update to release 1.8.16
Conflicts:
eclipse-subclipse.spec
eclipse-subclipse-1.8.13-dependencies.patch | 96 ++++++++++++++++-----------
eclipse-subclipse.spec | 11 ++-
sources | 2 +-
subclipse-fetch.sh | 2 +-
4 files changed, 66 insertions(+), 45 deletions(-)
---
diff --git a/eclipse-subclipse-1.8.13-dependencies.patch b/eclipse-subclipse-1.8.13-dependencies.patch
index dfc74f3..66b9984 100644
--- a/eclipse-subclipse-1.8.13-dependencies.patch
+++ b/eclipse-subclipse-1.8.13-dependencies.patch
@@ -1,40 +1,24 @@
-diff -Naur org.tigris.subversion.clientadapter.javahl/build.properties subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/build.properties
---- org.tigris.subversion.clientadapter.javahl/build.properties 2007-08-21 21:29:01.000000000 -0400
-+++ org.tigris.subversion.clientadapter.javahl/build.properties 2009-04-06 10:22:46.000000000 -0430
-@@ -1,5 +1,5 @@
--source.. = src/
--output.. = bin/
-+source.clientadapter-javahl.jar = src/
-+output.clientadapter-javahl.jar = bin/
- bin.includes = META-INF/,\
- .,\
- plugin.xml,\
-@@ -7,4 +7,5 @@
- about.ini,\
- about.properties,\
- epl-v10.html,\
-- svn.gif
-+ svn.gif,\
-+ svn-javahl.jar
---- org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF.sav 2012-02-13 17:22:22.000000000 +0200
-+++ org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF 2012-02-29 17:03:26.989474764 +0200
-@@ -7,6 +7,8 @@
- Bundle-Vendor: tigris.org
- Require-Bundle: org.eclipse.core.runtime,
- org.tigris.subversion.clientadapter;bundle-version="[1.8.1,1.9.0)"
-+Bundle-ClassPath: clientadapter-javahl.jar,
-+ svn-javahl.jar
- Eclipse-LazyStart: true
- Export-Package: org.apache.subversion.javahl,
- org.apache.subversion.javahl.callback,
---- org.tigris.subversion.clientadapter.javahl.feature/feature.xml.sav 2012-02-13 17:22:22.000000000 +0200
-+++ org.tigris.subversion.clientadapter.javahl.feature/feature.xml 2012-02-29 17:37:26.031806495 +0200
-@@ -33,24 +33,6 @@
- download-size="0"
- install-size="0"
+From 1966e39129419d304bc90daa795231db49e23bbc Mon Sep 17 00:00:00 2001
+From: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Thu, 11 Oct 2012 09:27:59 -0400
+Subject: [PATCH] eclipse-subclipse-1.8.13-dependencies
+
+Conflicts:
+ org.tigris.subversion.clientadapter.javahl.feature/feature.xml
+---
+ .../feature.xml | 18 ------------------
+ .../META-INF/MANIFEST.MF | 2 ++
+ .../build.properties | 7 ++++---
+ 3 files changed, 6 insertions(+), 21 deletions(-)
+
+diff --git org.tigris.subversion.clientadapter.javahl.feature/feature.xml org.tigris.subversion.clientadapter.javahl.feature/feature.xml
+index 56aa51b..0ac4d48 100644
+--- org.tigris.subversion.clientadapter.javahl.feature/feature.xml
++++ org.tigris.subversion.clientadapter.javahl.feature/feature.xml
+@@ -35,22 +35,4 @@
version="0.0.0"
-- unpack="false"/>
--
+ unpack="false"/>
+
- <plugin
- id="org.tigris.subversion.clientadapter.javahl.win32"
- os="win32"
@@ -47,11 +31,45 @@ diff -Naur org.tigris.subversion.clientadapter.javahl/build.properties subclipse
- <plugin
- id="org.tigris.subversion.clientadapter.javahl.win64"
- os="win32"
-- arch="x86"
+- arch="x86_64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-+ unpack="true"/>
-
+-
</feature>
+diff --git org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
+index ed6b62e..65be0be 100644
+--- org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
++++ org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
+@@ -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)"
++Bundle-ClassPath: clientadapter-javahl.jar,
++ svn-javahl.jar
+ Eclipse-LazyStart: true
+ Export-Package: org.apache.subversion.javahl,
+ org.apache.subversion.javahl.callback,
+diff --git org.tigris.subversion.clientadapter.javahl/build.properties org.tigris.subversion.clientadapter.javahl/build.properties
+index 5ae4430..21b4f3e 100644
+--- org.tigris.subversion.clientadapter.javahl/build.properties
++++ org.tigris.subversion.clientadapter.javahl/build.properties
+@@ -1,5 +1,5 @@
+-source.. = src/
+-output.. = bin/
++source.clientadapter-javahl.jar = src/
++output.clientadapter-javahl.jar = bin/
+ bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+@@ -7,4 +7,5 @@ bin.includes = META-INF/,\
+ about.ini,\
+ about.properties,\
+ epl-v10.html,\
+- svn.gif
++ svn.gif,\
++ svn-javahl.jar
+--
+1.7.11.4
+
diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec
index 513a1e5..d12977f 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_*
+%global javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.7.6.jar
# Add a comment to have something to commit to try to reproduce Adam
# Williamson's deadlock bug.
Name: eclipse-subclipse
-Version: 1.8.13
-Release: 3%{?dist}
+Version: 1.8.16
+Release: 1%{?dist}
Summary: Subversion Eclipse plugin
Group: Development/Tools
@@ -89,7 +89,7 @@ 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}/svn-javahl.jar
+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}
%files
@@ -102,6 +102,9 @@ ln -s %{_javadir}/svn-javahl.jar $installBase/subclipse-clientadapter-javahl/ecl
%changelog
+* Thu Oct 11 2012 Sami Wagiaalla <swagiaal at redhat.com> 1.8.16-1
+- Update to release 1.8.16.
+
* Fri Aug 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 1.8.13-3
- Bump version for proper f18 build.
diff --git a/sources b/sources
index 1563880..d6ff5dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a53aee2e09022c2ad37a846eb9fb811c subclipse-1.8.13.tar.xz
+decc16e60ef3bf73a7f7b25ad4d06308 subclipse-1.8.16.tar.xz
diff --git a/subclipse-fetch.sh b/subclipse-fetch.sh
index 52194ca..261f3c7 100755
--- a/subclipse-fetch.sh
+++ b/subclipse-fetch.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-VERSION=1.8.13
+VERSION=1.8.16
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