[eclipse-ptp] - Update to 7.0.3 - Drop deps patch and sysmon changes - removed upstream

Orion Poplawski orion at fedoraproject.org
Fri Aug 16 21:01:18 UTC 2013


commit 4f7d5a70a01bebae15c4a95bdfe0bdf7cbbf8307
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Aug 16 15:01:07 2013 -0600

    - Update to 7.0.3
    - Drop deps patch and sysmon changes - removed upstream

 .gitignore             |    1 +
 eclipse-ptp-deps.patch |   45 ---------------------------------------------
 eclipse-ptp.spec       |   22 +++++++---------------
 sources                |    2 +-
 4 files changed, 9 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 907f5cf..086d02e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /org.eclipse.ptp-PTP_7_0_0.tar.bz2
 /org.eclipse.ptp-7a7225fc8470b8ec4bc614ff9110d8045fa20a52.tar.bz2
 /org.eclipse.ptp-PTP_7_0_2.tar.bz2
+/org.eclipse.ptp-PTP_7_0_3.tar.bz2
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index e7a65c5..fd0f604 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -3,8 +3,8 @@
 %global pdereq                  1:4.2.0
 %global rsereq                  3.5
 %global pdebuild                %{_bindir}/eclipse-pdebuild
-%global ptp_build_id            201307220255
-%global ptp_git_tag             PTP_7_0_2
+%global ptp_build_id            201308141907
+%global ptp_git_tag             PTP_7_0_3
 #global ptp_git_tag             7a7225fc8470b8ec4bc614ff9110d8045fa20a52
 
 # All arches line up except i386 -> x86
@@ -20,7 +20,7 @@
 
 Summary:        Eclipse Parallel Tools Platform
 Name:           eclipse-ptp
-Version:        7.0.2
+Version:        7.0.3
 Release:        1%{?dist}
 License:        EPL
 Group:          Development/Tools
@@ -38,9 +38,6 @@ Source3:        finddeps.sh
 Patch0:         eclipse-ptp-notrax.patch
 # Remove rdt.remotetools from ptp feature
 Patch1:         eclipse-ptp-noremote.patch
-# Fix up some javax deps
-# smil in Fedora is merged in xml-commons-apis-ext.jar, reflecting upstream changes
-Patch2:         eclipse-ptp-deps.patch
 # Remove extra environments from pom.xml
 Patch3:         eclipse-ptp-tycho-build.patch
 # Add <repository> for tycho-eclipserun-plugin
@@ -336,20 +333,11 @@ tychover=$(sed -ne '/<version>/{s/.*>\(.*\)<.*/\1/;p;q}' < /usr/share/maven-frag
 sed -i -e "/tycho-version/s/>[0-9].*</>${tychover}</" pom.xml
 %patch0 -p1 -b .notrax
 %patch1 -p2 -b .noremote
-%patch2 -p1 -b .deps
 %patch3 -p2 -b .tycho-build
 %patch5 -p1 -b .repository
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
 # Remove bundled binaries
 rm -r releng/org.eclipse.ptp.linux/os/linux
-# We don't want to build a full product
-%pom_disable_module releng/org.eclipse.ptp-product
-%pom_disable_module releng/org.eclipse.ptp.product-feature
-%pom_disable_module releng/org.eclipse.ptp.rcp.sysmon.product
-# Disable the full sysmon for now
-%pom_disable_module releng/org.eclipse.ptp.rcp.sysmon
-%pom_disable_module releng/org.eclipse.ptp.rcp.sysmon-feature
-sed -i -e '/ptp.rcp.sysmon/d' releng/org.eclipse.ptp.repo/category.xml
 # Remotejars requires a bunch of downloaded prebuilt stuff
 %pom_disable_module rdt/org.eclipse.ptp.rdt.core.remotejars
 %pom_disable_module releng/org.eclipse.ptp.rdt.remotejars-feature
@@ -496,6 +484,10 @@ cp -p debug/org.eclipse.ptp.debug.sdm/bin/sdm %{buildroot}%{_libdir}/ptp/
 
 
 %changelog
+* Fri Aug 16 2013 Orion Poplawski <orion at cora.nwra.com> 7.0.3-1
+- Update to 7.0.3
+- Drop deps patch and sysmon changes - removed upstream
+
 * Sat Aug 3 2013 Orion Poplawski <orion at cora.nwra.com> 7.0.2-1
 - Update to 7.0.2
 
diff --git a/sources b/sources
index d39bc6c..f2c120d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf26b2dc8e0a924b4329b5dc4f565e72  org.eclipse.ptp-PTP_7_0_2.tar.bz2
+58eaefb70f4ba371ccf0327e1830fc9e  org.eclipse.ptp-PTP_7_0_3.tar.bz2


More information about the scm-commits mailing list