[eclipse-wtp-jeetools] Start building from upstream master for 3.5.0
Gerard Ryan
galileo at fedoraproject.org
Mon May 27 18:59:41 UTC 2013
commit 0b2ee07b7f19e1987051bbf192bc4a56f623b5a7
Author: Gerard Ryan <gerard at ryan.lt>
Date: Thu May 23 23:15:23 2013 +0100
Start building from upstream master for 3.5.0
.gitignore | 5 +
...-jeetools-fix-jst-enterpriseui-featurexml.patch | 132 --------------------
...etools-jst.enterprise_core-fix-featurexml.patch | 88 -------------
eclipse-wtp-jeetools-rm-wst.ws_core-include.patch | 74 -----------
eclipse-wtp-jeetools-rm-wst.ws_ui-include.patch | 25 ----
eclipse-wtp-jeetools-wst.web.patch | 23 ++++
eclipse-wtp-jeetools.spec | 32 +++---
sources | 10 +-
8 files changed, 50 insertions(+), 339 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c9a98a1..7789bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,8 @@
/webtools.sourceediting-201303071547.tar.bz2
/webtools.webservices-201303062343.tar.bz2
/R3_4_2.tar.bz2
+/webtools.common-v201305151500.tar.bz2
+/webtools.ejb-201305070000.tar.bz2
+/webtools.javaee-201305152300.tar.bz2
+/webtools.sourceediting-201305161752.tar.bz2
+/webtools.webservices-201304171447.tar.bz2
diff --git a/eclipse-wtp-jeetools-rm-wst.ws_core-include.patch b/eclipse-wtp-jeetools-rm-wst.ws_core-include.patch
index fed83b0..a38c559 100644
--- a/eclipse-wtp-jeetools-rm-wst.ws_core-include.patch
+++ b/eclipse-wtp-jeetools-rm-wst.ws_core-include.patch
@@ -11,77 +11,3 @@
<plugin
id="org.eclipse.jem"
download-size="0"
-@@ -52,73 +48,10 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jem.proxy"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jem.workbench"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jst.common.annotations.core"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jst.common.annotations.controller"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jst.common.frameworks"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jst.j2ee.web"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.jst.jsp.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jst.j2ee.core"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jst.j2ee"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jst.jee"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
- unpack="false"/>
-
- <plugin
diff --git a/eclipse-wtp-jeetools-rm-wst.ws_ui-include.patch b/eclipse-wtp-jeetools-rm-wst.ws_ui-include.patch
index 8b9de7c..b39bc7f 100644
--- a/eclipse-wtp-jeetools-rm-wst.ws_ui-include.patch
+++ b/eclipse-wtp-jeetools-rm-wst.ws_ui-include.patch
@@ -15,28 +15,3 @@
id="org.eclipse.jst.web_core.feature"
version="0.0.0"/>
-@@ -46,24 +38,10 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.common.ui"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.jst.jsp.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jst.jsp.ui.infopop"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
- unpack="false"/>
-
- </feature>
diff --git a/eclipse-wtp-jeetools-wst.web.patch b/eclipse-wtp-jeetools-wst.web.patch
new file mode 100644
index 0000000..c64e476
--- /dev/null
+++ b/eclipse-wtp-jeetools-wst.web.patch
@@ -0,0 +1,23 @@
+--- org.eclipse.jst.web_core.feature/feature.xml.orig 2013-05-18 22:12:27.188689873 +0100
++++ org.eclipse.jst.web_core.feature/feature.xml 2013-05-18 22:14:51.350012460 +0100
+@@ -20,6 +20,20 @@
+ </license>
+
+ <plugin
++ id="org.eclipse.wst.web"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.wst.web.ui"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
+ id="org.eclipse.jem"
+ download-size="0"
+ install-size="0"
diff --git a/eclipse-wtp-jeetools.spec b/eclipse-wtp-jeetools.spec
index 12c70ab..34abd08 100644
--- a/eclipse-wtp-jeetools.spec
+++ b/eclipse-wtp-jeetools.spec
@@ -1,23 +1,24 @@
%global install_loc %{_datadir}/eclipse/dropins/wtp-jeetools
-%global javaee_tag 201304111500
+%global javaee_tag 201305152300
%global javaee_dir webtools.javaee-%{javaee_tag}
-%global ejb_tag 201210040812
+%global ejb_tag 201305070000
%global ejb_dir webtools.ejb-%{ejb_tag}
-%global webservices_tag 201303062343
+%global webservices_tag 201304171447
%global webservices_dir webtools.webservices-%{webservices_tag}
-%global common_dir R3_4_2
+%global common_tag v201305151500
+%global common_dir webtools.common-%{common_tag}
-%global sourceediting_tag 201303071547
+%global sourceediting_tag 201305161752
%global sourceediting_dir webtools.sourceediting-%{sourceediting_tag}
Name: eclipse-wtp-jeetools
-Version: 3.4.2
-Release: 3%{?dist}
+Version: 3.5.0
+Release: 0.1%{?dist}
Summary: Frameworks and tools focused on development of J2EE artifacts
Group: Development/Tools
@@ -37,8 +38,6 @@ Source3: http://git.eclipse.org/c/webtools-common/webtools.common.git/snapshot/%
Source4: http://git.eclipse.org/c/sourceediting/webtools.sourceediting.git/snapshot/%{sourceediting_dir}.tar.bz2
Source5: http://www.eclipse.org/legal/epl-v10.html
-Patch1: %{name}-jst.enterprise_core-fix-featurexml.patch
-Patch2: %{name}-fix-jst-enterpriseui-featurexml.patch
Patch3: %{name}-jem.proxy-fix-getTypeClass-method.patch
Patch4: %{name}-jst.j2ee.webservice-manifest.patch
@@ -48,6 +47,7 @@ Patch6: %{name}-copyaxisjarcommand.patch
# These two patches just remove inclusion of features built in webservices
Patch7: %{name}-rm-wst.ws_ui-include.patch
Patch8: %{name}-rm-wst.ws_core-include.patch
+Patch9: %{name}-wst.web.patch
BuildArch: noarch
@@ -153,10 +153,9 @@ find -name MANIFEST.MF -exec sed -i -e \
"s/javax.wsdl;bundle-version=\"\[1\.5\.0,1\.6\.0)/javax.wsdl;bundle-version=\"\[1\.6\.2,1\.7\.0)/g" {} \;
pushd %{javaee_dir}/features
-%patch1
-%patch2
%patch7
%patch8
+%patch9
popd
pushd %{javaee_dir}/plugins
%patch3
@@ -178,14 +177,14 @@ find -name feature.xml -type f -exec sed -i -e 's/license-feature="org.eclipse.l
%build
-%{_bindir}/eclipse-pdebuild -f org.eclipse.jst.enterprise_ui.feature \
+%{_bindir}/eclipse-pdebuild -f org.eclipse.jst.web_ui.feature \
-d "eclipse-wtp-common wtp-sourceediting dtp-connectivity dtp-modelbase \
- org.eclipse.jst.server_ui.feature wtp-webservices xsd gef emf" \
+ org.eclipse.jst.server_ui.feature emf" \
-o `pwd`/orbit
-%{_bindir}/eclipse-pdebuild -f org.eclipse.jst.web_ui.feature \
+%{_bindir}/eclipse-pdebuild -f org.eclipse.jst.enterprise_ui.feature \
-d "eclipse-wtp-common wtp-sourceediting dtp-connectivity dtp-modelbase \
- org.eclipse.jst.server_ui.feature emf" \
+ org.eclipse.jst.server_ui.feature wtp-webservices xsd gef emf" \
-o `pwd`/orbit
@@ -213,6 +212,9 @@ popd
%doc %{javaee_dir}/plugins/org.eclipse.jst.jee/about.html
%changelog
+* Thu May 23 2013 Gerard Ryan <galileo at fedoraproject.org> - 3.5.0-0.1
+- Start building from upstream master branches in anticipation for 3.5.0
+
* Sun May 12 2013 Gerard Ryan <galileo at fedoraproject.org> 3.4.2-3
- Provide eclipse-wtp-jst-web so that it can be retired
diff --git a/sources b/sources
index 44a1fb3..da6370a 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-d0dba0a813ecac60f5e28aadae22f558 webtools.javaee-201304111500.tar.bz2
-f4baf2ad557711a48ee7eee1eabc94ec webtools.ejb-201210040812.tar.bz2
-60a114e41ad86ce537536c4991dc8ef6 webtools.sourceediting-201303071547.tar.bz2
-534f9984cf8c45a58bbdd3f1ef2a614d webtools.webservices-201303062343.tar.bz2
-8c07efc5bee8993d9769e1f4353ec174 R3_4_2.tar.bz2
+e98593577d5e00354f852cf3e2d2588e webtools.common-v201305151500.tar.bz2
+43eb1ceee571eaa58e39a58843bc7228 webtools.ejb-201305070000.tar.bz2
+24b8dbdbf649956e372d22cd40d1be6b webtools.javaee-201305152300.tar.bz2
+bc85669b58a5ee2de38ec5513d602187 webtools.sourceediting-201305161752.tar.bz2
+98a6b6698751ce9cbca0323177ba6535 webtools.webservices-201304171447.tar.bz2
More information about the scm-commits
mailing list