[eclipse-ptp: 2/2] Update to git master

[Orion Poplawski]

commit fa7767436a8d6119b44df9fc85e59490f81a7ccd
Author: Orion Poplawski <orion at nwra.com>
Date:   Tue Apr 9 10:57:33 2013 -0600

    Update to git master

 .gitignore                 |    2 ++
 eclipse-ptp-noremote.patch |   21 ++++++---------------
 eclipse-ptp.spec           |   17 ++++++++++-------
 sources                    |    4 ++--
 4 files changed, 20 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 50bc167..8482422 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@
 /org.eclipse.photran-7c45b16ff335f6d0d4fc0cc0983ec19bbffa0922.tar.gz
 /org.eclipse.ptp-7b02da97811f7eb9b57083da04da78a71e94cf5e.tar.gz
 /org.eclipse.photran-a3b657517fd448af21dbcfa9bf05e0e2cb36fbbb.tar.gz
+/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7.tar.gz
+/org.eclipse.photran-74923924e5df7031ca51b6de85a64ea7d96a5c70.tar.gz
diff --git a/eclipse-ptp-noremote.patch b/eclipse-ptp-noremote.patch
index 9ca0618..b2623b1 100644
--- a/eclipse-ptp-noremote.patch
+++ b/eclipse-ptp-noremote.patch
@@ -1,7 +1,7 @@
-diff -up eclipse-ptp-6.0.5/org.eclipse.ptp-7208b7ebdd851dda087d5ef1f618171eaa6ad515/releng/org.eclipse.ptp-feature/feature.xml.noremote eclipse-ptp-6.0.5/org.eclipse.ptp-7208b7ebdd851dda087d5ef1f618171eaa6ad515/releng/org.eclipse.ptp-feature/feature.xml
---- eclipse-ptp-6.0.5/org.eclipse.ptp-7208b7ebdd851dda087d5ef1f618171eaa6ad515/releng/org.eclipse.ptp-feature/feature.xml.noremote	2013-04-04 12:37:53.000000000 -0600
-+++ eclipse-ptp-6.0.5/org.eclipse.ptp-7208b7ebdd851dda087d5ef1f618171eaa6ad515/releng/org.eclipse.ptp-feature/feature.xml	2013-04-08 15:41:32.203774641 -0600
-@@ -82,10 +82,6 @@
+diff -up eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp-feature/feature.xml.noremote eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp-feature/feature.xml
+--- eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp-feature/feature.xml.noremote	2013-04-08 14:06:09.000000000 -0600
++++ eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp-feature/feature.xml	2013-04-09 10:44:41.015887777 -0600
+@@ -66,10 +66,6 @@
           version="0.0.0"/>
  
     <includes
@@ -9,16 +9,7 @@ diff -up eclipse-ptp-6.0.5/org.eclipse.ptp-7208b7ebdd851dda087d5ef1f618171eaa6ad
 -         version="0.0.0"/>
 -
 -   <includes
-          id="org.eclipse.ptp.rm.jaxb"
+          id="org.eclipse.ptp.rdt.sync"
           version="0.0.0"/>
  
-diff -up eclipse-ptp-6.0.5/org.eclipse.ptp-7208b7ebdd851dda087d5ef1f618171eaa6ad515/releng/org.eclipse.ptp.repo/category.xml.noremote eclipse-ptp-6.0.5/org.eclipse.ptp-7208b7ebdd851dda087d5ef1f618171eaa6ad515/releng/org.eclipse.ptp.repo/category.xml
---- eclipse-ptp-6.0.5/org.eclipse.ptp-7208b7ebdd851dda087d5ef1f618171eaa6ad515/releng/org.eclipse.ptp.repo/category.xml.noremote	2013-04-04 12:37:53.000000000 -0600
-+++ eclipse-ptp-6.0.5/org.eclipse.ptp-7208b7ebdd851dda087d5ef1f618171eaa6ad515/releng/org.eclipse.ptp.repo/category.xml	2013-04-08 15:45:43.691868971 -0600
-@@ -31,6 +31,5 @@
-    <feature url="features/org.eclipse.ptp.rdt_0.0.0.jar" id="org.eclipse.ptp.rdt" version="0.0.0"/>
-    <feature url="features/org.eclipse.ptp.rdt.xlc_0.0.0.jar" id="org.eclipse.ptp.rdt.xlc" version="0.0.0"/>
-    <feature url="features/org.eclipse.ptp.rdt.sync_0.0.0.jar" id="org.eclipse.ptp.rdt.sync" version="0.0.0"/>
--   <feature url="features/org.eclipse.ptp.rdt.remotetools_0.0.0.jar" id="org.eclipse.ptp.rdt.remotetools" version="0.0.0"/>
-    <feature url="features/org.eclipse.ptp.rdt.editor_0.0.0.jar" id="org.eclipse.ptp.rdt.editor" version="0.0.0"/>
- </site>
+diff -up eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.repo/category.xml.noremote eclipse-ptp-7.0.0/org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7/releng/org.eclipse.ptp.repo/category.xml
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index cda7088..6261d42 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -1,22 +1,22 @@
-%global ptpver                  6.0.5
-%global photranver              8.0.5
+%global ptpver                  7.0.0
+%global photranver              8.1.0
 %global eclipse_base            %{_datadir}/eclipse
 %global cdtreq                  1:8.1.0
 %global pdereq                  1:4.2.0
 %global rsereq                  3.2
 %global pdebuild                %{_bindir}/eclipse-pdebuild
-%global ptp_build_id            201303141502
+%global ptp_build_id            20130409
 #global ptp_git_tag             PTP_6_0_2
-%global ptp_git_tag             7b02da97811f7eb9b57083da04da78a71e94cf5e
-%global photran_build_id        201303141447
+%global ptp_git_tag             3ef93135125e9616e863d879fe188f338f01d9a7
+%global photran_build_id        20130409
 #global photran_git_tag         PTP_6_0_2
-%global photran_git_tag         a3b657517fd448af21dbcfa9bf05e0e2cb36fbbb
+%global photran_git_tag         74923924e5df7031ca51b6de85a64ea7d96a5c70
 
 Summary:        Eclipse Parallel Tools Platform
 Name:           eclipse-ptp
 # Be sure to update photran version if needed
 Version:        %{ptpver}
-Release:        1%{?dist}
+Release:        0.1.20130409git%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/ptp
@@ -472,6 +472,9 @@ sed -i -e '/org.eclipse.rephraserengine_/d' files.org.eclipse.photran_%{photranv
 
 
 %changelog
+* Tue Apr 9 2013 Orion Poplawski <orion at cora.nwra.com> - 7.0.0-0.1.20130409git
+- Update to git master
+
 * Mon Apr 8 2013 Orion Poplawski <orion at cora.nwra.com> - 6.0.5-1
 - Update to PTP 6.0.5, photran 8.0.5
 - Remove rdt.remotetools feature beause we are unable to build
diff --git a/sources b/sources
index d358495..4971d20 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1a9c9b5e2dfbcc8ebad65efc7a508b1b  org.eclipse.ptp-7b02da97811f7eb9b57083da04da78a71e94cf5e.tar.gz
-75c04a439172e6effcfa0f0d8048eb08  org.eclipse.photran-a3b657517fd448af21dbcfa9bf05e0e2cb36fbbb.tar.gz
+b40afcf482b30b4ab7afd529575108ba  org.eclipse.ptp-3ef93135125e9616e863d879fe188f338f01d9a7.tar.gz
+e76e2c8243726cb01034fc13af28e1fa  org.eclipse.photran-74923924e5df7031ca51b6de85a64ea7d96a5c70.tar.gz