[eclipse-ptp] Update to PTP 5.0.2, photran 7.0.2 Update deps patch Add jaxb to feature build before ptp
Orion Poplawski
orion at fedoraproject.org
Fri Oct 21 20:50:49 UTC 2011
commit 46c7f6fcc2629b97dd76fe8840f500fa68a8006b
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Oct 21 14:50:47 2011 -0600
Update to PTP 5.0.2, photran 7.0.2
Update deps patch
Add jaxb to feature build before ptp
.gitignore | 1 +
eclipse-ptp-deps.patch | 56 +++++++++++++----------------------------------
eclipse-ptp.spec | 17 ++++++++------
sources | 2 +-
4 files changed, 28 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2231147..6d697a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/org.eclipse.ptp-v201104291906.tar.gz
/org.eclipse.ptp-v201106140904.tar.gz
/org.eclipse.ptp-v201107131351.tar.gz
+/org.eclipse.ptp-v201109141657.tar.gz
diff --git a/eclipse-ptp-deps.patch b/eclipse-ptp-deps.patch
index 2cb4fd3..ebbaf08 100644
--- a/eclipse-ptp-deps.patch
+++ b/eclipse-ptp-deps.patch
@@ -1,17 +1,10 @@
-diff -up org.eclipse.ptp-v201107131351/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml.deps org.eclipse.ptp-v201107131351/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml
---- org.eclipse.ptp-v201107131351/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml.deps 2011-05-25 20:08:10.000000000 -0600
-+++ org.eclipse.ptp-v201107131351/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml 2011-08-31 14:30:43.209362459 -0600
-@@ -60,20 +60,6 @@
+diff -up org.eclipse.ptp-v201110141146/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml.deps org.eclipse.ptp-v201110141146/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml
+--- org.eclipse.ptp-v201110141146/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml.deps 2011-09-23 07:53:39.000000000 -0600
++++ org.eclipse.ptp-v201110141146/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml 2011-10-21 14:47:01.146240727 -0600
+@@ -67,13 +67,6 @@
unpack="false"/>
<plugin
-- id="javax.xml.stream"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="com.sun.xml.bind"
- download-size="0"
- install-size="0"
@@ -22,44 +15,27 @@ diff -up org.eclipse.ptp-v201107131351/releng/org.eclipse.ptp.rm.jaxb-feature/fe
id="org.eclipse.ptp.rm.jaxb.control.core"
download-size="0"
install-size="0"
-diff -up org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF
---- org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF.deps 2011-05-18 19:50:32.000000000 -0600
-+++ org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF 2011-08-31 15:25:43.325615919 -0600
-@@ -15,10 +15,7 @@ Require-Bundle: org.eclipse.core.runtime
- org.eclipse.ptp.core,
+diff -up org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF
+--- org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF.deps 2011-09-01 16:59:30.000000000 -0600
++++ org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF 2011-10-21 14:48:52.586249165 -0600
+@@ -16,8 +16,7 @@ Require-Bundle: org.eclipse.core.runtime
org.eclipse.ptp.rm.core,
javax.xml;bundle-version="1.3.4",
-- javax.xml.stream;bundle-version="1.0.1",
+ javax.xml.stream;bundle-version="1.0.1",
- javax.xml.bind;bundle-version="2.1.9",
- com.sun.xml.bind;bundle-version="2.1.9",
-- javax.activation;bundle-version="1.1.0",
+ javax.xml.bind;bundle-version="2.0.0",
org.eclipse.cdt.debug.core;bundle-version="7.1.0",
org.eclipse.core.variables;bundle-version="3.2.400"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-diff -up org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF
---- org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF.deps 2011-06-04 09:02:38.000000000 -0600
-+++ org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF 2011-08-31 15:25:26.426143517 -0600
-@@ -19,8 +19,6 @@ Require-Bundle: org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.ptp.remote.core,
+diff -up org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF
+--- org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF.deps 2011-08-10 07:16:41.000000000 -0600
++++ org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF 2011-10-21 14:48:47.624426901 -0600
+@@ -17,6 +17,5 @@ Bundle-Vendor: %pluginProvider
+ Require-Bundle: org.eclipse.core.runtime,
javax.xml;bundle-version="1.3.4",
-- javax.xml.stream;bundle-version="1.0.1",
+ javax.xml.stream;bundle-version="1.0.1",
- javax.xml.bind;bundle-version="2.1.9",
-- com.sun.xml.bind;bundle-version="2.1.9",
+- com.sun.xml.bind;bundle-version="2.1.9"
+ javax.xml.bind;bundle-version="2.0.0",
- org.eclipse.ptp.core
- Bundle-Localization: plugin
-diff -up org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.ui/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.ui/META-INF/MANIFEST.MF
---- org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.ui/META-INF/MANIFEST.MF.deps 2011-06-04 09:01:39.000000000 -0600
-+++ org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.ui/META-INF/MANIFEST.MF 2011-08-31 15:25:37.000813481 -0600
-@@ -6,8 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Localization: plugin
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Require-Bundle: javax.xml;bundle-version="1.3.4",
-- javax.xml.bind;bundle-version="2.1.9",
-- javax.xml.stream;bundle-version="1.0.1",
-+ javax.xml.bind;bundle-version="2.0.0",
- org.eclipse.ui;bundle-version="3.6.1",
- org.eclipse.core.runtime,
- org.eclipse.ptp.rm.lml.core;bundle-version="1.0.0",
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 417baf6..24101ab 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -1,7 +1,7 @@
-%global ptpver 5.0.1
-%global photranver 7.0.1
+%global ptpver 5.0.2
+%global photranver 7.0.2
#global reltag ptp_4_0
-%global reltag v201107131351
+%global reltag v201109141657
%global eclipse_noarch_base %{_datadir}/eclipse
%global eclipse_arch_base %{_libdir}/eclipse
%global cdtreq 1:8.0.0
@@ -12,7 +12,7 @@ Summary: Eclipse Parallel Tools Platform
Name: eclipse-ptp
# Be sure to update photran version if needed
Version: %{ptpver}
-Release: 2%{?dist}
+Release: 1%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/ptp
@@ -277,8 +277,6 @@ build-jar-repository -s -p orbitDeps xml-commons-apis jaxme/jaxmeapi.jar
# Needed for shared license references to work
mv releng/org.eclipse.ptp.license-feature releng/org.eclipse.ptp.license
ln -s ../releng/org.eclipse.ptp.license photran/
-# Incorrectly tagged
-rm rdt/org.eclipse.ptp.rdt.managedbuilder.gnu.ui/src/org/eclipse/ptp/rdt/managedbuilder/gnu/ui/scannerdiscovery/PerProjectSICollectorSkipCygTrans.java
%build
@@ -297,7 +295,7 @@ rm -rf cdtdb-4.0.3-eclipse
# main feature and others. Use -Dnoclean=true so the aggregate features don't remove
# needed pre-built dependencies
# remotejars attempts to bundle up jars and fails to build
-for feature in org.eclipse.ptp.{utils,services,remote,remotetools} org.eclipse.photran org.eclipse.photran.{intel,xlf} org.eclipse.ptp.rdt org.eclipse.ptp org.eclipse.ptp.{etfw.{ppw,tau,tau.fortran},gem,pldt.upc,rdt.{sync,sync.fortran,xlc},remote.rse,sci,sdk}
+for feature in org.eclipse.ptp.{utils,services,remote,remotetools} org.eclipse.photran org.eclipse.photran.{intel,xlf} org.eclipse.ptp.rdt org.eclipse.ptp.rm.jaxb org.eclipse.ptp org.eclipse.ptp.{etfw.{ppw,tau,tau.fortran},gem,pldt.upc,rdt.{sync,sync.fortran,xlc},remote.rse,sci,sdk}
do
%{eclipse_arch_base}/buildscripts/pdebuild -d "cdt cdt-parsers jgit rse" \
-f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5 -Dnoclean=true" -o `pwd`/orbitDeps
@@ -411,6 +409,11 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
+* Thu Oct 20 2011 Orion Poplawski <orion at cora.nwra.com> - 5.0.2-1
+- Update to PTP 5.0.2, photran 7.0.2
+- Update deps patch
+- Add jaxb to feature build before ptp
+
* Tue Sep 6 2011 Orion Poplawski <orion at cora.nwra.com> - 5.0.1-2
- Fixup some dependencies
diff --git a/sources b/sources
index 9a1a422..3752683 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8de8bad520cd02ebdd856c8b6d2d2e73 org.eclipse.ptp-v201107131351.tar.gz
bf55fcfb24bbc519bb737add2c2bff72 cdtdb-4.0.3-eclipse.jar
+4387da0c9cfe9483a832da0d2e9b2a0e org.eclipse.ptp-v201109141657.tar.gz
More information about the scm-commits
mailing list