rpms/eclipse-subclipse/devel eclipse-subclipse-1.6.0-dependencies.patch, NONE, 1.1 subclipse-fetch.sh, NONE, 1.1 .cvsignore, 1.7, 1.8 eclipse-subclipse.spec, 1.29, 1.30 sources, 1.7, 1.8 eclipse-subclipse-1.4.7-dependencies.patch, 1.1, NONE subclipse-fetch-1.4.7.sh, 1.1, NONE
Robert Marcano
robmv at fedoraproject.org
Mon Apr 6 15:10:18 UTC 2009
Author: robmv
Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20565
Modified Files:
.cvsignore eclipse-subclipse.spec sources
Added Files:
eclipse-subclipse-1.6.0-dependencies.patch subclipse-fetch.sh
Removed Files:
eclipse-subclipse-1.4.7-dependencies.patch
subclipse-fetch-1.4.7.sh
Log Message:
Update to upstream 1.6.0
eclipse-subclipse-1.6.0-dependencies.patch:
--- NEW FILE eclipse-subclipse-1.6.0-dependencies.patch ---
diff -Naur subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/build.properties subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/build.properties
--- subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/build.properties 2007-08-21 21:29:01.000000000 -0400
+++ subclipse-1.6.0/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
diff -Naur subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
--- subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF 2009-02-23 15:51:38.000000000 -0430
+++ subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF 2009-04-06 10:22:46.000000000 -0430
@@ -8,6 +8,9 @@
Require-Bundle: org.eclipse.core.runtime,
org.tigris.subversion.clientadapter;bundle-version="[1.6.0,1.7.0)"
Eclipse-LazyStart: true
+Bundle-ClassPath: clientadapter-javahl.jar,
+ svn-javahl.jar,
+ .
Export-Package: org.tigris.subversion.javahl,
org.tigris.subversion.svnclientadapter.javahl
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff -Naur subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl.feature/feature.xml
--- subclipse-1.6.0.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml 2009-02-23 15:51:38.000000000 -0430
+++ subclipse-1.6.0/org.tigris.subversion.clientadapter.javahl.feature/feature.xml 2009-04-06 10:22:46.000000000 -0430
@@ -33,14 +33,14 @@
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="true"/>
- <plugin
+<!-- <plugin
id="org.tigris.subversion.clientadapter.javahl.win32"
os="win32"
download-size="0"
install-size="0"
version="0.0.0"
- fragment="true"/>
+ fragment="true"/>-->
</feature>
--- NEW FILE subclipse-fetch.sh ---
#!/bin/sh
VERSION=1.6.0
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.win32
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 24 Feb 2009 16:11:35 -0000 1.7
+++ .cvsignore 6 Apr 2009 15:09:47 -0000 1.8
@@ -1 +1 @@
-subclipse-1.4.7.tgz
+subclipse-1.6.0.tgz
Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- eclipse-subclipse.spec 23 Mar 2009 16:40:42 -0000 1.29
+++ eclipse-subclipse.spec 6 Apr 2009 15:09:47 -0000 1.30
@@ -1,12 +1,12 @@
%define eclipse_name eclipse
%define eclipse_base %{_libdir}/%{eclipse_name}
%define install_loc %{_datadir}/eclipse/dropins
-%define javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.5.4.1
+%define javahl_plugin_name org.tigris.subversion.clientadapter.javahl_%{version}
Name: eclipse-subclipse
-Version: 1.4.7
-Release: 4%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
Summary: Subversion Eclipse plugin
Group: Development/Tools
@@ -14,8 +14,8 @@
URL: http://subclipse.tigris.org/
Source0: subclipse-%{version}.tgz
# Script to fetch the source code
-Source10: subclipse-fetch-%{version}.sh
-Patch0: eclipse-subclipse-1.4.7-dependencies.patch
+Source10: subclipse-fetch.sh
+Patch0: eclipse-subclipse-1.6.0-dependencies.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,8 +30,8 @@
BuildRequires: eclipse-svnkit >= 1.2.2
Requires: eclipse-svnkit >= 1.2.2
-BuildRequires: subversion-javahl >= 1.5
-Requires: subversion-javahl >= 1.5
+BuildRequires: subversion-javahl >= 1.6
+Requires: subversion-javahl >= 1.6
Obsoletes: eclipse-subclipse-book < 1.4
@@ -123,9 +123,15 @@
%changelog
+<<<<<<< eclipse-subclipse.spec
+* Mon Apr 26 2009 Robert Marcano <robert at marcanoonline.com> 1.6.0-1
+- Update to upstream 1.6.0
+
+=======
* Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1.4.7-4
- Rebuild to not ship p2 context.xml.
+>>>>>>> 1.29
* Tue Feb 24 2009 Robert Marcano <robert at marcanoonline.com> 1.4.7-3
- Update to upstream 1.4.7
- eclipse-subclipse-book is obsoleted, not provided upstream
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 24 Feb 2009 16:11:36 -0000 1.7
+++ sources 6 Apr 2009 15:09:47 -0000 1.8
@@ -1 +1 @@
-c0faddf79339cf86b757a8679c7f592d subclipse-1.4.7.tgz
+847948fa1ec5888219d259fd94d85198 subclipse-1.6.0.tgz
--- eclipse-subclipse-1.4.7-dependencies.patch DELETED ---
--- subclipse-fetch-1.4.7.sh DELETED ---
More information about the fedora-extras-commits
mailing list