[eclipse-rse] Update to Kepler RC3.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Jun 7 13:32:11 UTC 2013
commit dfd0d8c0cde6cc23ba2de4103347b87b52ae74da
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Jun 7 16:31:50 2013 +0300
Update to Kepler RC3.
.gitignore | 1 +
eclipse-rse-commons-net-source.patch | 62 +++++++++++++++-----------------
eclipse-rse-tm-repo.patch | 26 +++++++-------
eclipse-rse-top-pom.patch | 64 +++++++++++++++++++--------------
eclipse-rse.spec | 43 +++++++++--------------
featureVersions.properties | 26 --------------
fetch-rse.sh | 15 --------
pluginVersions.properties | 63 ---------------------------------
sources | 2 +-
9 files changed, 98 insertions(+), 204 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e4e4e2..9f6d40a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ rse-fetched-src-R3_2.tar.gz
/rse-fetched-src-R3_3_1.tar.gz
/rse-fetched-src-R3_4.tar.gz
/eclipse-rse-3.5M6.tar.gz
+/S3_5RC3.tar.bz2
diff --git a/eclipse-rse-commons-net-source.patch b/eclipse-rse-commons-net-source.patch
index 1585a2d..c4581ea 100644
--- a/eclipse-rse-commons-net-source.patch
+++ b/eclipse-rse-commons-net-source.patch
@@ -1,22 +1,6 @@
-diff -up ./releng/org.eclipse.tm.releng.master-feature/feature.xml.fix2 ./releng/org.eclipse.tm.releng.master-feature/feature.xml
---- ./releng/org.eclipse.tm.releng.master-feature/feature.xml.fix2 2013-04-04 14:40:09.000000000 -0400
-+++ ./releng/org.eclipse.tm.releng.master-feature/feature.xml 2013-04-04 14:40:32.000000000 -0400
-@@ -83,12 +83,6 @@
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-- <plugin
-- id="org.apache.commons.net.source"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
- <!--
- <plugin
- id="org.eclipse.tm.tcf.agent"
-diff -up ./rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml.fix2 ./rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml
---- ./rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml.fix2 2013-04-04 14:46:54.000000000 -0400
-+++ ./rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml 2013-04-04 14:47:03.000000000 -0400
+diff -up ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml.fix2 ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
+--- ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml.fix2 2013-04-04 14:45:51.000000000 -0400
++++ ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml 2013-04-04 14:46:10.000000000 -0400
@@ -34,13 +34,6 @@
</url>
@@ -28,12 +12,12 @@ diff -up ./rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/featur
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rse.services.files.ftp.source"
+ id="org.eclipse.rse.connectorservice.telnet.source"
download-size="0"
install-size="0"
-diff -up ./rse/features/org.eclipse.rse.ftp.source/feature.xml.fix2 ./rse/features/org.eclipse.rse.ftp.source/feature.xml
---- ./rse/features/org.eclipse.rse.ftp.source/feature.xml.fix2 2013-04-04 14:43:57.000000000 -0400
-+++ ./rse/features/org.eclipse.rse.ftp.source/feature.xml 2013-04-04 14:44:11.000000000 -0400
+diff -up ./rse/features/org.eclipse.rse.telnet.source/feature.xml.fix2 ./rse/features/org.eclipse.rse.telnet.source/feature.xml
+--- ./rse/features/org.eclipse.rse.telnet.source/feature.xml.fix2 2013-04-04 14:44:50.000000000 -0400
++++ ./rse/features/org.eclipse.rse.telnet.source/feature.xml 2013-04-04 14:45:00.000000000 -0400
@@ -34,13 +34,6 @@
</url>
@@ -45,12 +29,25 @@ diff -up ./rse/features/org.eclipse.rse.ftp.source/feature.xml.fix2 ./rse/featur
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rse.services.files.ftp.source"
+ id="org.eclipse.rse.connectorservice.telnet.source"
download-size="0"
install-size="0"
-diff -up ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml.fix2 ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
---- ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml.fix2 2013-04-04 14:45:51.000000000 -0400
-+++ ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml 2013-04-04 14:46:10.000000000 -0400
+--- releng/org.eclipse.tm.releng.master-feature/feature.xml.orig 2013-06-07 14:15:23.481634980 +0300
++++ releng/org.eclipse.tm.releng.master-feature/feature.xml 2013-06-07 14:17:37.701625357 +0300
+@@ -72,11 +72,4 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
+- id="org.apache.commons.net.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+ </feature>
+--- rse/features/org.eclipse.rse.ftp.source/feature.xml.orig 2013-05-31 20:34:41.000000000 +0300
++++ rse/features/org.eclipse.rse.ftp.source/feature.xml 2013-06-07 14:22:01.241613462 +0300
@@ -34,13 +34,6 @@
</url>
@@ -62,23 +59,22 @@ diff -up ./rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/fea
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rse.connectorservice.telnet.source"
+ id="org.eclipse.rse.services.files.ftp.source"
download-size="0"
install-size="0"
-diff -up ./rse/features/org.eclipse.rse.telnet.source/feature.xml.fix2 ./rse/features/org.eclipse.rse.telnet.source/feature.xml
---- ./rse/features/org.eclipse.rse.telnet.source/feature.xml.fix2 2013-04-04 14:44:50.000000000 -0400
-+++ ./rse/features/org.eclipse.rse.telnet.source/feature.xml 2013-04-04 14:45:00.000000000 -0400
+--- rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml.orig 2013-06-07 14:21:15.153614716 +0300
++++ rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml 2013-06-07 14:23:39.294611883 +0300
@@ -34,13 +34,6 @@
</url>
<plugin
- id="org.apache.commons.net.source"
- download-size="207"
-- install-size="348"
+- install-size="419"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rse.connectorservice.telnet.source"
+ id="org.eclipse.rse.services.files.ftp.source"
download-size="0"
install-size="0"
diff --git a/eclipse-rse-tm-repo.patch b/eclipse-rse-tm-repo.patch
index 8a33668..47db217 100644
--- a/eclipse-rse-tm-repo.patch
+++ b/eclipse-rse-tm-repo.patch
@@ -1,22 +1,22 @@
-diff -up ./releng/org.eclipse.tm.repo/category.xml.fix ./releng/org.eclipse.tm.repo/category.xml
---- ./releng/org.eclipse.tm.repo/category.xml.fix 2013-04-10 15:17:38.000000000 -0400
-+++ ./releng/org.eclipse.tm.repo/category.xml 2013-04-10 15:19:23.000000000 -0400
-@@ -15,6 +15,10 @@
- <feature url="features/org.eclipse.rse.scp_0.2.0.qualifier.jar" id="org.eclipse.rse.scp" version="0.2.0.qualifier">
+--- releng/org.eclipse.tm.repo/category.xml.orig 2013-05-31 20:34:41.000000000 +0300
++++ releng/org.eclipse.tm.repo/category.xml 2013-06-07 15:47:26.975109903 +0300
+@@ -15,9 +15,10 @@
+ <feature url="features/org.eclipse.rse.scp_0.2.100.qualifier.jar" id="org.eclipse.rse.scp" version="0.2.100.qualifier">
<category name="tm_35_optional"/>
</feature>
-+ <feature url="features/org.eclipse.tm.terminal.view_2.4.1.qualifier.jar" id="org.eclipse.tm.terminal.view" version="2.4.1.qualifier">
-+ <category name="tm_35_optional"/>
-+ </feature>
-+<!--
- <feature url="features/org.eclipse.rse.tests_3.4.1.qualifier.jar" id="org.eclipse.rse.tests" version="3.4.1.qualifier">
+- <feature url="features/org.eclipse.rse.tests_3.4.100.qualifier.jar" id="org.eclipse.rse.tests" version="3.4.100.qualifier">
++ <feature url="features/org.eclipse.tm.terminal.view_2.4.100.qualifier.jar" id="org.eclipse.tm.terminal.view" version="2.4.100.qualifier">
<category name="tm_35_optional"/>
</feature>
-@@ -25,6 +29,7 @@
++ <!--
+ <feature url="features/org.eclipse.tm.terminal.local.sdk_0.3.100.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.3.100.qualifier">
+ <category name="tm_35_optional"/>
+ </feature>
+@@ -25,6 +26,7 @@
<category name="tm_35_main"/>
</feature>
- <feature url="features/org.eclipse.tm.terminal.core.sdk_3.3.2.qualifier.jar" id="org.eclipse.tm.terminal.core.sdk" version="3.3.2.qualifier"/>
-+-->
+ <feature url="features/org.eclipse.tm.terminal.core.sdk_3.3.100.qualifier.jar" id="org.eclipse.tm.terminal.core.sdk" version="3.3.100.qualifier"/>
++ -->
<category-def name="tm_35_main" label="TM and RSE 3.5 Main Features">
<description>
TM and RSE Main Features
diff --git a/eclipse-rse-top-pom.patch b/eclipse-rse-top-pom.patch
index 5240d02..410e7af 100644
--- a/eclipse-rse-top-pom.patch
+++ b/eclipse-rse-top-pom.patch
@@ -1,6 +1,5 @@
-diff -up ./pom.xml.fix ./pom.xml
---- ./pom.xml.fix 2013-04-09 16:40:44.000000000 -0400
-+++ ./pom.xml 2013-04-09 16:41:24.000000000 -0400
+--- pom.xml.orig 2013-05-31 20:34:41.000000000 +0300
++++ pom.xml 2013-06-07 16:07:38.815902331 +0300
@@ -14,11 +14,11 @@
<prerequisites>
<maven>3.0</maven>
@@ -15,7 +14,7 @@ diff -up ./pom.xml.fix ./pom.xml
<groupId>org.eclipse.tm</groupId>
<artifactId>tm-parent</artifactId>
<version>3.8.0-SNAPSHOT</version>
-@@ -264,17 +264,24 @@
+@@ -228,17 +228,24 @@
<!-- <module>rse/plugins/org.eclipse.rse.useractions.sdk</module> -->
<module>releng/org.eclipse.tm.repo</module>
<module>terminal/plugins/org.eclipse.tm.terminal</module>
@@ -41,7 +40,7 @@ diff -up ./pom.xml.fix ./pom.xml
<module>terminal/features/org.eclipse.tm.terminal.core.sdk-feature</module>
<module>terminal/features/org.eclipse.tm.terminal.sdk-feature</module>
<module>terminal/features/org.eclipse.tm.terminal.local-feature</module>
-@@ -287,6 +294,7 @@
+@@ -251,6 +258,7 @@
<module>wince/org.eclipse.rse.wince-feature</module>
<module>wince/org.eclipse.rse.subsystems.wince</module>
<module>wince/org.eclipse.tm.rapi</module>
@@ -49,10 +48,12 @@ diff -up ./pom.xml.fix ./pom.xml
</modules>
<build>
<plugins>
-@@ -324,41 +332,6 @@
+@@ -286,42 +294,7 @@
+ <environment>
+ <os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
+- <arch>x86</arch>
+- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
@@ -87,24 +88,33 @@ diff -up ./pom.xml.fix ./pom.xml
- <os>aix</os>
- <ws>gtk</ws>
- <arch>ppc</arch>
-- </environment>
++ <arch>noarch</arch>
+ </environment>
</environments>
<resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
-@@ -369,14 +342,14 @@
- <type>eclipse-plugin</type>
- <id>org.apache.commons.net</id>
- <restrictTo>
-- <versionRange>[2.2,3.0)</versionRange>
-+ <versionRange>[2.2,4.0)</versionRange>
- </restrictTo>
- </filter>
- <filter>
- <type>eclipse-plugin</type>
- <id>org.apache.commons.net.source</id>
- <restrictTo>
-- <versionRange>[2.2,3.0)</versionRange>
-+ <versionRange>[2.2,4.0)</versionRange>
- </restrictTo>
- </filter>
- </filters>
+@@ -376,25 +349,8 @@
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho-version}</version>
+- <dependencies>
+- <dependency>
+- <groupId>org.eclipse.tycho.extras</groupId>
+- <artifactId>tycho-buildtimestamp-jgit</artifactId>
+- <version>${tycho-version}</version>
+- </dependency>
+- <dependency>
+- <groupId>org.eclipse.tycho.extras</groupId>
+- <artifactId>tycho-sourceref-jgit</artifactId>
+- <version>${tycho-extras-version}</version>
+- </dependency>
+- </dependencies>
+ <configuration>
+ <strictBinIncludes>false</strictBinIncludes>
+- <timestampProvider>jgit</timestampProvider>
+- <jgit.ignore>pom.xml</jgit.ignore>
+- <sourceReferences>
+- <generate>true</generate>
+- </sourceReferences>
+ </configuration>
+ </plugin>
+ <plugin>
diff --git a/eclipse-rse.spec b/eclipse-rse.spec
index bb20763..d86137e 100644
--- a/eclipse-rse.spec
+++ b/eclipse-rse.spec
@@ -10,16 +10,11 @@
Name: eclipse-rse
Summary: Eclipse Remote System Explorer
Version: 3.5
-Release: 0.3.m6%{?dist}
+Release: 0.4.rc3%{?dist}
License: EPL
URL: http://www.eclipse.org/dsdp/tm/
-# Following tarball fetched by using the fetch.sh script to clone
-# and tar the repository. This is needed because the timestamp qualifiers
-# are generated by tycho-extras using the last update time of various
-# plug-ins and features
-Source0: eclipse-rse-3.5M6.tar.gz
-Source1: fetch-rse.sh
+Source0: http://git.eclipse.org/c/tm/org.eclipse.tm.git/snapshot/S3_5RC3.tar.bz2
Source4: notice.html
Source5: epl-v10.html
@@ -86,14 +81,12 @@ Requires: java
The Remote System Explorer (RSE) framework server that can be used so clients can connect to this machine via RSE.
%prep
-%setup -q -c
+%setup -q -n S3_5RC3
-pushd %{rse_snapshot}
-
-%patch3
+%patch3 -b .orig
%patch4
%patch5
-%patch6
+%patch6 -b .orig
sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
@@ -102,13 +95,9 @@ pushd rse/plugins/org.eclipse.rse.services.dstore
%patch2
popd
-popd
-
%build
-pushd %{rse_snapshot}
-
-mvn-rpmbuild -o -DskipTychoVersionCheck -Dmaven.test.skip=true -fae clean install
+mvn-rpmbuild -DskipTychoVersionCheck -Dmaven.test.skip=true clean install
cp %{SOURCE4} .
cp %{SOURCE5} .
@@ -121,10 +110,10 @@ install -d -m 755 %{buildroot}%{rseserver_install}
install -d -m 755 %{buildroot}%{rseserver_java}
install -d -m 755 %{buildroot}%{rseserver_config}
-cp -R org.eclipse.tm/releng/org.eclipse.tm.repo/target/repository/features \
+cp -R releng/org.eclipse.tm.repo/target/repository/features \
%{buildroot}%{install_loc}/rse/eclipse \
-cp -R org.eclipse.tm/releng/org.eclipse.tm.repo/target/repository/plugins \
+cp -R releng/org.eclipse.tm.repo/target/repository/plugins \
%{buildroot}%{install_loc}/rse/eclipse \
pushd %{buildroot}%{install_loc}/rse/eclipse/plugins
@@ -148,7 +137,7 @@ jarname=`ls org.eclipse.rse.services_*.jar`
zip -d $jarname clientserver.jar
popd
-pushd org.eclipse.tm/rse/plugins/org.eclipse.rse.services.dstore
+pushd rse/plugins/org.eclipse.rse.services.dstore
pushd serverruntime/scripts/linux
cp *.pl %{buildroot}%{rseserver_install}
popd
@@ -156,23 +145,25 @@ pushd serverruntime/data
cp *.properties %{buildroot}%{rseserver_config}
cp *.dat %{buildroot}%{rseserver_install}
popd
-popd
%files
%{install_loc}/rse
-%doc org.eclipse.tm/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html
-%doc org.eclipse.tm/rse/features/org.eclipse.rse.sdk-feature/license.html
+%doc rse/features/org.eclipse.rse.sdk-feature/epl-v10.html
+%doc rse/features/org.eclipse.rse.sdk-feature/license.html
%files server
%{rseserver_install}
%{rseserver_java}
-%{rseserver_config}
+%dir %{rseserver_config}
%config(noreplace) %{rseserver_config}/ssl.properties
%config(noreplace) %{rseserver_config}/rsecomm.properties
-%doc org.eclipse.tm/notice.html
-%doc org.eclipse.tm/epl-v10.html
+%doc notice.html
+%doc epl-v10.html
%changelog
+* Fri Jun 7 2013 Alexander Kurtakov <akurtako at redhat.com> 3.5-0.4.rc3
+- Update to Kepler RC3.
+
* Wed Apr 10 2013 Jeff Johnston <jjohnstn at redhat.com> 3.5-0.3.m6
- Add terminal view feature to category.xml.
diff --git a/sources b/sources
index 6598aa1..55338a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6519416d73f010ff0dc7d2897e17c409 eclipse-rse-3.5M6.tar.gz
+3ec6f1cb3c3a382745ebab30cd7c868c S3_5RC3.tar.bz2
More information about the scm-commits
mailing list