[eclipse-ptp/f17] Update to PTP Juno M6 (6.0.0 pre-release)

Jeff Johnston jjohnstn at fedoraproject.org
Thu Apr 19 20:21:16 UTC 2012


commit 161adcf84f45989bd94d3eb4d9c3b1f2497366cf
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Tue Apr 17 17:54:41 2012 -0400

    Update to PTP Juno M6 (6.0.0 pre-release)

 .gitignore                         |    2 +
 eclipse-ptp-deps.patch             |   81 ++------------------
 eclipse-ptp-remove-overrides.patch |  151 ++++++++++++++++++++++++++++++++++++
 eclipse-ptp.spec                   |   92 ++++++++++++++--------
 sources                            |    4 +-
 5 files changed, 219 insertions(+), 111 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 999c493..f80ad9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
 /org.eclipse.photran-7.0.6.tar.xz
 /org.eclipse.ptp-5.0.7.tar.xz
 /org.eclipse.photran-7.0.7.tar.xz
+/org.eclipse.photran-f3decf9a5a9293d4f478e10b9f65e270ed08d068.tar.gz
+/org.eclipse.ptp-015cebabbf5f3c114d6928883375de8b647c53bf.tar.gz
diff --git a/eclipse-ptp-deps.patch b/eclipse-ptp-deps.patch
index c177ba6..76c4d5a 100644
--- a/eclipse-ptp-deps.patch
+++ b/eclipse-ptp-deps.patch
@@ -1,81 +1,12 @@
-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-24 13:34:13.521681362 -0600
-@@ -46,34 +46,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="javax.xml"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="javax.xml.bind"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         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"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.ptp.rm.jaxb.control.core"
-          download-size="0"
-          install-size="0"
-@@ -85,13 +57,6 @@
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="javax.activation"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
-          unpack="false"/>
- 
- </feature>
-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-24 13:16:25.558024346 -0600
-@@ -14,10 +14,6 @@ Require-Bundle: org.eclipse.core.runtime
+diff -up ./rms/org.eclipse.ptp.rm.jaxb.tests/META-INF/MANIFEST.MF.fix2 ./rms/org.eclipse.ptp.rm.jaxb.tests/META-INF/MANIFEST.MF
+--- ./rms/org.eclipse.ptp.rm.jaxb.tests/META-INF/MANIFEST.MF.fix2	2012-04-17 14:16:03.000000000 -0400
++++ ./rms/org.eclipse.ptp.rm.jaxb.tests/META-INF/MANIFEST.MF	2012-04-17 14:16:15.000000000 -0400
+@@ -13,8 +13,6 @@ Require-Bundle: org.eclipse.core.runtime
   org.eclipse.ptp.remote.core,
   org.eclipse.ptp.core,
   org.eclipse.ptp.rm.core,
 - javax.xml;bundle-version="1.3.4",
-- 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",
   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-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-24 13:16:32.262792082 -0600
-@@ -14,9 +14,5 @@ Export-Package: org.eclipse.ptp.rm.lml.c
- Bundle-Activator: org.eclipse.ptp.rm.lml.core.LMLCorePlugin
- Bundle-ActivationPolicy: lazy
- 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.bind;bundle-version="2.1.9",
-- com.sun.xml.bind;bundle-version="2.1.9"
-+Require-Bundle: org.eclipse.core.runtime
- Bundle-Localization: plugin
-diff -up org.eclipse.ptp-v201110141146/tools/etfw/org.eclipse.ptp.etfw.parallel/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201110141146/tools/etfw/org.eclipse.ptp.etfw.parallel/META-INF/MANIFEST.MF
+  org.junit;bundle-version="3.8.2",
+  org.eclipse.ptp.rm.jaxb.core;bundle-version="1.0.0",
diff --git a/eclipse-ptp-remove-overrides.patch b/eclipse-ptp-remove-overrides.patch
new file mode 100644
index 0000000..d1bffd7
--- /dev/null
+++ b/eclipse-ptp-remove-overrides.patch
@@ -0,0 +1,151 @@
+diff -up ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java.fix ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java
+--- ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java.fix	2012-04-16 16:25:30.000000000 -0400
++++ ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java	2012-04-16 16:25:46.000000000 -0400
+@@ -56,7 +56,6 @@ public class CrayErrorParser implements 
+ 	private static final int FILENAME_GROUP = 5;
+ 	private static final int LINE_NUMBER_GROUP = 6;
+ 
+-	@Override
+ 	public boolean processLine(String currentLine, ErrorParserManager eoParser) {
+ 		final Matcher matcher = matchErrorWarningLine(eoParser.getPreviousLine());
+ 		if (matcher != null) {
+diff -up ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java.fix ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java
+--- ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java.fix	2012-04-16 16:25:39.000000000 -0400
++++ ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java	2012-04-16 16:25:56.000000000 -0400
+@@ -55,7 +55,6 @@ public class Open64ErrorParser implement
+     // Capture groups in the above regexes
+     private static final int ALT_DESCRIPTION_GROUP = 1;
+ 
+-    @Override
+     public boolean processLine(String currentLine, ErrorParserManager eoParser)
+     {
+         Matcher matcher = matchErrorWarningLine(eoParser.getPreviousLine());
+diff -up ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java.fix ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java
+--- ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java.fix	2012-04-16 13:31:34.000000000 -0400
++++ ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java	2012-04-16 13:31:54.000000000 -0400
+@@ -135,7 +135,6 @@ class ASTPreprocessorName extends ASTPre
+     /* (non-Javadoc)
+      * @see org.eclipse.cdt.core.dom.ast.IASTNode#getOriginalNode()
+      */
+-    @Override
+     public IASTNode getOriginalNode()
+     {
+         // TODO Auto-generated method stub
+diff -up ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java.fix ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java
+--- ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java.fix	2012-04-16 13:32:09.000000000 -0400
++++ ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java	2012-04-16 13:32:55.000000000 -0400
+@@ -330,7 +330,6 @@ class ASTInclusionStatement extends ASTP
+     /* (non-Javadoc)
+      * @see org.eclipse.cdt.core.dom.ast.IASTNode#getOriginalNode()
+      */
+-    @Override
+     public IASTNode getOriginalNode()
+     {
+         // TODO Auto-generated method stub
+@@ -661,7 +660,6 @@ class ASTMacroExpansion extends ASTPrepr
+     /* (non-Javadoc)
+      * @see org.eclipse.cdt.core.dom.ast.IASTNode#getOriginalNode()
+      */
+-    @Override
+     public IASTNode getOriginalNode()
+     {
+         // TODO Auto-generated method stub
+diff -up ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java.fix ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java
+--- ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java.fix	2012-04-16 16:32:31.000000000 -0400
++++ ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java	2012-04-16 16:33:20.000000000 -0400
+@@ -576,9 +576,9 @@ public class FortranEditor extends CDTBa
+ 
+         private static class EntirePartitionDamager implements IPresentationDamager
+         {
+-            @Override public void setDocument(IDocument document) { }
++            public void setDocument(IDocument document) { }
+ 
+-            @Override public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent event, boolean documentPartitioningChanged)
++            public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent event, boolean documentPartitioningChanged)
+             {
+                 return partition;
+             }
+diff -up ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java.fix ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java
+--- ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java.fix	2012-04-16 16:33:29.000000000 -0400
++++ ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java	2012-04-16 16:34:28.000000000 -0400
+@@ -70,7 +70,6 @@ public class FortranStmtPartitionScanner
+         this.editor = editor;
+     }
+ 
+-    @Override
+     public void setRange(IDocument document, int offset, int length)
+     {
+         this.document = document;
+@@ -78,7 +77,6 @@ public class FortranStmtPartitionScanner
+         this.endOffset = offset + length;
+     }
+ 
+-    @Override
+     public void setPartialRange(IDocument document, int offset, int length, String contentType,
+         int partitionOffset)
+     {
+@@ -96,7 +94,6 @@ public class FortranStmtPartitionScanner
+ 
+     }
+ 
+-    @Override
+     public IToken nextToken()
+     {
+         this.tokenOffset = startOffset;
+@@ -158,13 +155,11 @@ public class FortranStmtPartitionScanner
+         }
+     }
+ 
+-    @Override
+     public int getTokenOffset()
+     {
+         return tokenOffset;
+     }
+ 
+-    @Override
+     public int getTokenLength()
+     {
+         return tokenLength;
+diff -up ./core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java.fix ./core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java
+--- ./core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java.fix	2012-04-16 17:16:38.000000000 -0400
++++ ./core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java	2012-04-16 17:16:38.000000000 -0400
+@@ -29,7 +29,6 @@ public class LocalResource implements IR
+ 	 * 
+ 	 * @see org.eclipse.ptp.remote.core.IRemoteResource#getDefaultLocationURI(org.eclipse.core.resources.IResource)
+ 	 */
+-	@Override
+ 	public URI getActiveLocationURI() {
+ 		return fResource.getLocationURI();
+ 	}
+@@ -39,7 +38,6 @@ public class LocalResource implements IR
+ 	 * 
+ 	 * @see org.eclipse.ptp.remote.core.IRemoteResource#getResource()
+ 	 */
+-	@Override
+ 	public IResource getResource() {
+ 		return fResource;
+ 	}
+@@ -49,7 +47,6 @@ public class LocalResource implements IR
+ 	 * 
+ 	 * @see org.eclipse.ptp.remote.core.IRemoteResource#refresh(org.eclipse.core.runtime.IProgressMonitor)
+ 	 */
+-	@Override
+ 	public void refresh(IProgressMonitor monitor) throws CoreException {
+ 		fResource.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ 	}
+@@ -59,7 +56,6 @@ public class LocalResource implements IR
+ 	 * 
+ 	 * @see org.eclipse.ptp.remote.core.IRemoteResource#setResource(org.eclipse.core.resources.IResource)
+ 	 */
+-	@Override
+ 	public void setResource(IResource resource) {
+ 		fResource = resource;
+ 	}
+diff -up ./rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties.fix ./rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties
+--- ./rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties.fix	2012-04-17 14:11:23.000000000 -0400
++++ ./rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties	2012-04-17 14:11:38.000000000 -0400
+@@ -1,4 +1,3 @@
+-source.. = src/
+ output.. = bin/
+ bin.includes = META-INF/,\
+                .,\
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index b08c878..df41a94 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -1,9 +1,9 @@
-%global ptpver                  5.0.7
-%global photranver              7.0.7
+%global ptpver                  6.0.0
+%global photranver              8.0.0
 %global eclipse_noarch_base     %{_datadir}/eclipse
 %global eclipse_arch_base       %{_libdir}/eclipse
-%global cdtreq                  1:8.0.1
-%global pdereq                  1:3.7.0
+%global cdtreq                  1:8.1.0
+%global pdereq                  1:4.2.0
 %global rsereq                  3.2
 %if 0%{?fedora} >= 17
 %global pdebuild                %{_bindir}/eclipse-pdebuild
@@ -15,19 +15,24 @@ Summary:        Eclipse Parallel Tools Platform
 Name:           eclipse-ptp
 # Be sure to update photran version if needed
 Version:        %{ptpver}
-Release:        1%{?dist}
+Release:        0.1.junom6%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/ptp
 
-# The following tarballs were generated by the makesource.sh script
-Source0:        org.eclipse.ptp-%{ptpver}.tar.xz
-Source1:        org.eclipse.photran-%{photranver}.tar.xz
+# The following tarballs were downloaded from the git repositories
+Source0:        http://git.eclipse.org/c/ptp/org.eclipse.ptp.git/snapshot/org.eclipse.ptp-015cebabbf5f3c114d6928883375de8b647c53bf.tar.gz
+Source1:        http://git.eclipse.org/c/ptp/org.eclipse.photran.git/snapshot/org.eclipse.photran-f3decf9a5a9293d4f478e10b9f65e270ed08d068.tar.gz
 Source2:        makesource.sh
 # To help generate the needed Requires
 Source3:        finddeps.sh
+
+Patch0:		%{name}-deps.patch
+
+# Patch so Java compiler won't fail when interface methods are implemented with override statement
+Patch1:		%{name}-remove-overrides.patch
+
 # Remove some unneeded dependencies
-Patch0:         eclipse-ptp-deps.patch
 BuildRequires:  java-devel >= 1.5.0
 BuildRequires:  eclipse-pde >= %{pdereq}
 BuildRequires:  eclipse-cdt-parsers >= %{cdtreq}
@@ -285,12 +290,28 @@ Provides support for remote services using RSE.
 
 
 %prep
-%setup -q -c -a 0 -a 1
-%patch0 -p1 -b .deps
+%setup -q -c -T -a 0 -a 1
+
+# Move the commit snapshot contents up one directory so we can build
+# as normal
+pushd org.eclipse.photran-f3decf9a5a9293d4f478e10b9f65e270ed08d068
+cp -r . ..
+popd
+pushd org.eclipse.ptp-015cebabbf5f3c114d6928883375de8b647c53bf
+cp -r . ..
+popd
+rm -rf org.eclipse.photran-f3decf9a5a9293d4f478e10b9f65e270ed08d068
+rm -rf org.eclipse.ptp-015cebabbf5f3c114d6928883375de8b647c53bf
+
+# Remove erroneous override statements
+%patch0
+%patch1
+
 # We need to rebuild this jar from the sources within it
+pwd
 mkdir cdtdb-4.0.3-eclipse
 pushd cdtdb-4.0.3-eclipse
-unzip -q ../org.eclipse.rephraserengine.core.vpg/cdtdb-4.0.3-eclipse.jar
+unzip -q ../org.eclipse.rephraserengine.core/cdtdb-4.0.3-eclipse.jar
 find -name \*.class -exec rm {} +
 popd
 # Delete any other jars in the project
@@ -300,7 +321,6 @@ sed -i -e 's/os="linux"//' org.eclipse.photran.intel-feature/feature.xml
 #Fix line endings, causes problems with pdebuild link names
 find -name MANIFEST.MF -exec sed -i -e 's|\r||' {} +
 
-
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
@@ -308,7 +328,7 @@ export PATH=%{java_bin}:/usr/bin:$PATH
 pushd cdtdb-4.0.3-eclipse
 classpath=$(echo %{_libdir}/eclipse/plugins/org.eclipse.equinox.common_*.jar | sed -e 's/ /:/g')
 find -name \*java -exec javac -classpath $classpath '{}' +
-jar cf ../org.eclipse.rephraserengine.core.vpg/cdtdb-4.0.3-eclipse.jar *
+jar cf ../org.eclipse.rephraserengine.core/cdtdb-4.0.3-eclipse.jar *
 popd
 #Interferes with feature build
 rm -rf cdtdb-4.0.3-eclipse
@@ -317,7 +337,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 run git 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{,.sync,.sync.fortran,.xlc} org.eclipse.ptp.core org.eclipse.ptp.rm.jaxb{,.contrib} org.eclipse.ptp org.eclipse.ptp.{etfw.{ppw,tau,tau.fortran},gem,pldt.{fortran,upc},remote.rse,sci,sdk}
+for feature in org.eclipse.ptp.{utils,services,remote,remotetools,core} org.eclipse.photran org.eclipse.photran.{intel,xlf} org.eclipse.ptp.rdt{.editor,,.sync,.sync.fortran,.xlc} org.eclipse.ptp.core org.eclipse.ptp.rm.jaxb{,.contrib} org.eclipse.ptp org.eclipse.ptp.{etfw.{ppw,tau,tau.fortran},gem,pldt.{fortran,upc},remote.rse,sci,sdk}
 do
   %{pdebuild} -d "cdt cdt-parsers jgit rse" \
     -f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5 -Dnoclean=true"
@@ -347,82 +367,86 @@ done
 
 
 %files
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp
 
 %files master
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 
 %files etfw-ppw
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.etfw.ppw
 
 %files etfw-tau
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.etfw.tau
 
 %files etfw-tau-fortran
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.etfw.tau.fortran
 
 %files gem
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.gem
 
 %files pldt-fortran
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.pldt.fortran
 
 %files pldt-upc
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.pldt.upc
 
 %files rdt
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt
+%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.editor
 
 %files rdt-sync
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.sync
 
 %files rdt-sync-fortran
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.sync.fortran
 
 %files rdt-xlc
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.xlc
 
 %files remote-rse
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.remote.rse
 
 %files rm-contrib
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.rm.jaxb.contrib
 
 %files sci
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.sci
 
 %files sdk
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.ptp.sdk
 
 %files -n eclipse-photran
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.photran
 
 %files -n eclipse-photran-intel
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.photran.intel
 
 %files -n eclipse-photran-xlf
-%doc releng/org.eclipse.ptp.master/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_noarch_base}/dropins/org.eclipse.photran.xlf
 
 
 %changelog
+* Thu Apr 19 2012 Jeff Johnston <jjohnstn at redhat.com> - 6.0.0-0.1.junom6
+- Update to PTP Juno M6 (6.0.0 pre-release)
+
 * Fri Apr 13 2012 Orion Poplawski <orion at cora.nwra.com> - 5.0.7-1
 - Update to PTP 5.0.7, photran 7.0.7
 - Add %%{pdebuild} macro
diff --git a/sources b/sources
index 2e12e51..808bcab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c54a8e580bf84d11ad4fc414b0e3ba78  org.eclipse.ptp-5.0.7.tar.xz
-79379e65df51f069760c9f832350d509  org.eclipse.photran-7.0.7.tar.xz
+722abd97ec46320e86f7191c3e309d5b  org.eclipse.photran-f3decf9a5a9293d4f478e10b9f65e270ed08d068.tar.gz
+46e89d98fd151ec1dcf9056c7155501a  org.eclipse.ptp-015cebabbf5f3c114d6928883375de8b647c53bf.tar.gz


More information about the scm-commits mailing list