[eclipse-wtp-sourceediting] Update to latest upstream 3.4.2
Gerard Ryan
galileo at fedoraproject.org
Sun Apr 21 19:44:18 UTC 2013
commit 9bb509b6803323610b4904e573ec69cefe9570e1
Author: Gerard Ryan <gerard at ryan.lt>
Date: Sun Apr 21 20:35:28 2013 +0100
Update to latest upstream 3.4.2
.gitignore | 7 +++
eclipse-wtp-sourceediting.spec | 113 +++++++++++++++++++++++++++++++---------
sources | 8 +++-
3 files changed, 102 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eaed021..5769303 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,10 @@ eclipse-wtp-sourceediting-3.3.1-fetched-src.tar.bz2
/eclipse-wtp-sourceediting-3.4.0
eclipse-wtp-sourceediting-R3.4.0.tar.gz
/.project
+/webtools.javaee-201303062000.tar.bz2
+/webtools.jsdt.core-201208171701.tar.bz2
+/webtools.jsdt.debug-201208241832.tar.bz2
+/webtools.sourceediting-201303071547.tar.bz2
+/webtools.sourceediting.xpath-201301101919.tar.bz2
+/webtools.sourceediting.xsl-201212051838.tar.bz2
+/webtools.sourceediting-201303221844.tar.bz2
diff --git a/eclipse-wtp-sourceediting.spec b/eclipse-wtp-sourceediting.spec
index 9df516b..543d39d 100644
--- a/eclipse-wtp-sourceediting.spec
+++ b/eclipse-wtp-sourceediting.spec
@@ -1,34 +1,64 @@
-%global eclipse_base %{_libdir}/eclipse
-%global install_loc %{_datadir}/eclipse/dropins/wtp-sourceediting
+%global install_loc %{_datadir}/eclipse/dropins/wtp-sourceediting
+
+%global sourceediting_tag 201303071547
+%global sourceediting_dir webtools.sourceediting-%{sourceediting_tag}
+
+%global xsl_tag 201212051838
+%global xsl_dir webtools.sourceediting.xsl-%{xsl_tag}
+
+%global xpath_tag 201301101919
+%global xpath_dir webtools.sourceediting.xpath-%{xpath_tag}
+
+%global tests_tag 201301110332
+%global tests_dir webtools.sourceediting.tests-%{tests_tag}
+
+%global jsdt_core_tag 201208171701
+%global jsdt_core_dir webtools.jsdt.core-%{jsdt_core_tag}
+
+%global jsdt_debug_tag 201208241832
+%global jsdt_debug_dir webtools.jsdt.debug-%{jsdt_debug_tag}
+
+%global javaee_tag 201303062000
+%global javaee_dir webtools.javaee-%{javaee_tag}
Name: eclipse-wtp-sourceediting
-Version: 3.4.0
-Release: 3%{?dist}
+Version: 3.4.2
+Release: 1%{?dist}
Summary: WTP Source Editing
Group: Development/Tools
License: EPL
URL: http://www.eclipse.org/projects/project.php?id=webtools.sourceediting
-Source0: %{name}-R%{version}.tar.gz
+Source0: http://git.eclipse.org/c/sourceediting/webtools.sourceediting.git/snapshot/%{sourceediting_dir}.tar.bz2
+Source1: http://git.eclipse.org/c/sourceediting/webtools.sourceediting.xsl.git/snapshot/%{xsl_dir}.tar.bz2
+Source2: http://git.eclipse.org/c/sourceediting/webtools.sourceediting.xpath.git/snapshot/%{xpath_dir}.tar.bz2
+#Source3: http://git.eclipse.org/c/sourceediting/webtools.sourceediting.tests.git/snapshot/%{tests_dir}.tar.bz2
+Source4: http://git.eclipse.org/c/jsdt/webtools.jsdt.core.git/snapshot/%{jsdt_core_dir}.tar.bz2
+Source5: http://git.eclipse.org/c/jsdt/webtools.jsdt.debug.git/snapshot/%{jsdt_debug_dir}.tar.bz2
+Source6: http://git.eclipse.org/c/jeetools/webtools.javaee.git/snapshot/%{javaee_dir}.tar.bz2
+# TODO: This additional sourceediting tag is because of a missing feature in stable one. Remove for 3.5.* release
+Source7: http://git.eclipse.org/c/sourceediting/webtools.sourceediting.git/snapshot/webtools.sourceediting-201303221844.tar.bz2
-BuildArch: noarch
+BuildArch: noarch
Patch1: xml-core-feature.patch
Patch2: xml-core.patch
Patch3: fix-jsdt.patch
Patch4: %{name}-wst.xsl-rm-commons.logging-version-check.patch
+Patch5: %{name}-rhino-debugger-update.patch
BuildRequires: java-devel
BuildRequires: jpackage-utils
-BuildRequires: eclipse-platform >= 1:3.7.0
-BuildRequires: eclipse-pde >= 1:3.7.0
-BuildRequires: eclipse-emf >= 2.6.0
-BuildRequires: eclipse-emf-xsd >= 2.6.0
-BuildRequires: eclipse-emf-core >= 2.8.0
-BuildRequires: eclipse-gef >= 3.7.0
-BuildRequires: eclipse-wtp-common >= 3.4.0
+BuildRequires: eclipse-platform >= 1:4.2.0
+BuildRequires: eclipse-pde >= 1:4.2.0
+BuildRequires: eclipse-emf >= 2.8.1
+BuildRequires: eclipse-emf-xsd >= 2.8.1
+BuildRequires: eclipse-emf-core >= 2.8.1
+BuildRequires: eclipse-gef >= 3.8.1
+BuildRequires: eclipse-wtp-common >= 3.4.2-4
+BuildRequires: eclipse-wtp-servertools >= 3.4.2-2
BuildRequires: eclipse-rcp >= 4.2.0
BuildRequires: eclipse-swt >= 4.2.0
BuildRequires: eclipse-jdt >= 4.2.0
@@ -39,7 +69,7 @@ BuildRequires: xerces-j2 >= 2.11.0
BuildRequires: xalan-j2 >= 2.7.1-10
BuildRequires: xml-commons-apis >= 1.3.4
BuildRequires: xml-commons-resolver >= 1.2
-BuildRequires: rhino >= 1.7-0.9.r2
+BuildRequires: rhino >= 1.7R4
BuildRequires: java_cup >= 1:0.11a-8
BuildRequires: bcel >= 5.1-11
BuildRequires: glassfish-jsp-api >= 2.2.1
@@ -49,12 +79,13 @@ BuildRequires: log4j >= 1.2.17-2
Requires: java
Requires: jpackage-utils
-Requires: eclipse-platform >= 1:3.7.0
-Requires: eclipse-emf >= 2.6.0
-Requires: eclipse-emf-xsd >= 2.6.0
-Requires: eclipse-emf-core >= 2.8.0
-Requires: eclipse-gef >= 3.7.0
-Requires: eclipse-wtp-common >= 3.4.0
+Requires: eclipse-platform >= 1:4.2.0
+Requires: eclipse-emf >= 2.8.1
+Requires: eclipse-emf-xsd >= 2.8.1
+Requires: eclipse-emf-core >= 2.8.1
+Requires: eclipse-gef >= 3.8.1
+Requires: eclipse-wtp-common >= 3.4.2-4
+Requires: eclipse-wtp-servertools >= 3.4.2
Requires: eclipse-rcp >= 4.2.0
Requires: eclipse-swt >= 4.2.0
Requires: eclipse-jdt >= 4.2.0
@@ -65,7 +96,7 @@ Requires: xerces-j2 >= 2.11.0
Requires: xalan-j2 >= 2.7.1-10
Requires: xml-commons-apis >= 1.3.4
Requires: xml-commons-resolver >= 1.2
-Requires: rhino >= 1.7-0.9.r2
+Requires: rhino >= 1.7R4
Requires: java_cup >= 1:0.11a-8
Requires: bcel >= 5.1-11
Requires: glassfish-jsp-api >= 2.2.1
@@ -78,7 +109,21 @@ and the mixing of them. XML, XML Schema, XSL, HTML, CSS, DTD, and JSP
resources, as well as an XML Perspective.
%prep
-%setup -q -n eclipse-wtp-sourceediting-R%{version}
+%setup -q -c
+%setup -q -T -D -a 1
+%setup -q -T -D -a 2
+#setup -q -T -D -a 3
+%setup -q -T -D -a 4
+%setup -q -T -D -a 5
+%setup -q -T -D -a 6
+
+# TODO: Remove this for 3.5.*
+# Take missing feature from another tag
+tar xfj %{SOURCE7}
+pushd webtools.sourceediting-201303221844/
+cp -r features/org.eclipse.wst.web_userdoc.feature/ ../%{sourceediting_dir}/features/
+popd
+rm -r webtools.sourceediting-201303221844/
#Orbit links
rm -rf orbit
@@ -98,23 +143,37 @@ pushd orbit
popd
#Patch XML_CORE feature.xml xerces version
+pushd %{sourceediting_dir}/features/
%patch1
+popd
#Patch XML_CORE XMLValidator.java for Xerces new version
+pushd %{sourceediting_dir}/bundles/
%patch2
+popd
#Add dependency to jsdt (it needs the xml_ui to be built first_
-%patch3
+#pushd %{jsdt_core_dir}/features/
+#patch3
+#popd
#Remove old version check for org.apache.commons.logging
+pushd %{xsl_dir}/features/
%patch4
+popd
+
+# Update for rhino 1.7R4 - patch from eclipse bugzilla
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=387850
+pushd %{jsdt_debug_dir}/
+%patch5 -p1
+popd
#Remove license attributes from feature.xml
find -name feature.xml -exec sed -i -e 's/license-feature.*"//' '{}' \;
%build
eclipse-pdebuild -f org.eclipse.wst.web_ui.feature \
- -d "xsd emf gef eclipse-wtp-common" \
+ -d "xsd emf gef eclipse-wtp-common org.eclipse.wst.server_ui.feature" \
-o `pwd`/orbit
eclipse-pdebuild -f org.eclipse.wst.xsl.feature \
@@ -166,9 +225,13 @@ popd
%files
%{install_loc}
-%doc org.eclipse.wst.doc.user/about.html
+%doc %{sourceediting_dir}/docs/org.eclipse.wst.doc.user/about.html
%changelog
+* Sun Apr 21 2013 Gerard Ryan <galileo at fedoraproject.org> 3.4.2-1
+- Update to upstream 3.4.2
+- Update minimum BR/R dependency versions
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index aeb575e..2619d2b 100644
--- a/sources
+++ b/sources
@@ -1 +1,7 @@
-01ecf2ea66792e3c54d869130c7d8675 eclipse-wtp-sourceediting-R3.4.0.tar.gz
+f7e2bf85a4c1a99cd3a136c12802a5c8 webtools.javaee-201303062000.tar.bz2
+5d6855df2cac936cc8cc4f8e7c22188f webtools.jsdt.core-201208171701.tar.bz2
+99f89fd35420824858375ecac6f174f2 webtools.jsdt.debug-201208241832.tar.bz2
+60a114e41ad86ce537536c4991dc8ef6 webtools.sourceediting-201303071547.tar.bz2
+438f5c1163c65748f6aca23bcf4d1ed0 webtools.sourceediting.xpath-201301101919.tar.bz2
+36a53453601406e92e95da2650fd29ce webtools.sourceediting.xsl-201212051838.tar.bz2
+d026f42f03546785f6c0a87b602be805 webtools.sourceediting-201303221844.tar.bz2
More information about the scm-commits
mailing list