[eclipse-ptp/f21] Update to latest upstream release

Mat Booth mbooth at fedoraproject.org
Tue Aug 19 15:23:46 UTC 2014 

commit fd7868a5490485539625468904e4178575c593ee
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Aug 19 16:16:58 2014 +0100

    Update to latest upstream release
    
    - Fix FTBFS rhbz #1106199

 .gitignore               |   44 ++------------
 eclipse-ptp-notrax.patch |   68 ---------------------
 eclipse-ptp.spec         |  146 ++++++++++++++++++++++++----------------------
 3 files changed, 84 insertions(+), 174 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 71af129..8526437 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,7 @@
-/cdtdb-4.0.3-eclipse.jar
-/org.eclipse.ptp-v201009162109.tar.gz
-/org.eclipse.ptp-v201011041729.tar.gz
-/org.eclipse.ptp-v201011100956.tar.gz
-/org.eclipse.ptp-v201102161000.tar.gz
-/org.eclipse.ptp-v201104291906.tar.gz
-/org.eclipse.ptp-v201106140904.tar.gz
-/org.eclipse.ptp-v201107131351.tar.gz
-/org.eclipse.ptp-v201109141657.tar.gz
-/org.eclipse.ptp-v201110141146.tar.gz
-/org.eclipse.ptp-5.0.4-a3efe7a2a670e1bb8cbb3b8c34a4998a75fb7889.tar.xz
-/org.eclipse.photran-7.0.4-0afa02baf34e4f253eabf14097fde9dc8088aa3d.tar.xz
-/org.eclipse.ptp-5.0.5.tar.xz
-/org.eclipse.photran-7.0.5.tar.xz
-/org.eclipse.ptp-5.0.6.tar.xz
-/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
-/org.eclipse.ptp-a0dac268418a969d9a24e8f641827238d2d5f0ce.tar.gz
-/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
-/org.eclipse.ptp-c4667a9a6061f2fbee014509432aac74a985672b.tar.gz
-/org.eclipse.ptp-22754dbf2eec157ff95132e23cbc87e865eee8eb.tar.gz
-/org.eclipse.ptp-bd8fbd1ef122a3ff350ddeed85173ba81ae56d95.tar.gz
-/org.eclipse.ptp-d11d96ce9e2e0a845a4cc1691161387ea1684b82.tar.gz
-/org.eclipse.ptp-71cc5a7643594056b908419341474804cb71be0e.tar.gz
-/org.eclipse.ptp-845dccdf1c3da6dc2ee621b05cd31f9c72d11797.tar.gz
-/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
-/org.eclipse.ptp-PTP_7_0_4.tar.bz2
+/org.eclipse.ptp-*.tar.bz2
+/org.eclipse.ptp-*/
+/.project
+/.build-*.log
+/noarch
+/x86_64
+/*.src.rpm
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 8090b12..e75228f 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -2,26 +2,25 @@
 %global cdtreq                  1:8.1.0
 %global pdereq                  1:4.2.0
 %global rsereq                  3.5
-%global pdebuild                %{_bindir}/eclipse-pdebuild
-%global ptp_build_id            201402121320
-%global ptp_git_tag             PTP_7_0_4
-#global ptp_git_tag             7a7225fc8470b8ec4bc614ff9110d8045fa20a52
+%global ptp_git_tag             PTP_8_0_0
 
-# All arches line up except i386 -> x86
 %ifarch %{ix86}
-%define eclipse_arch    x86
-%else
+    %define eclipse_arch x86
+%endif
 %ifarch %{arm}
-%define eclipse_arch    arm
-%else
-%define eclipse_arch   %{_arch}
+    %define eclipse_arch arm
+%endif
+%ifarch ppc64 ppc64p7
+    %define eclipse_arch ppc64
 %endif
+%ifarch s390 s390x ppc x86_64 aarch64 ppc64le
+    %define eclipse_arch %{_arch}
 %endif
 
 Summary:        Eclipse Parallel Tools Platform
 Name:           eclipse-ptp
-Version:        7.0.4
-Release:        3%{?dist}
+Version:        8.0.0
+Release:        1%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/ptp
@@ -34,14 +33,12 @@ Source2:        makesource.sh
 # To help generate the needed Requires
 Source3:        finddeps.sh
 
-# Remove dependency specifications on ant-trax
-Patch0:         eclipse-ptp-notrax.patch
 # Remove rdt.remotetools from ptp feature
-Patch1:         eclipse-ptp-noremote.patch
+Patch0:         eclipse-ptp-noremote.patch
 # Remove extra environments from pom.xml
-Patch3:         eclipse-ptp-tycho-build.patch
+Patch1:         eclipse-ptp-tycho-build.patch
 # Add <repository> for tycho-eclipserun-plugin
-Patch5:         eclipse-ptp-repository.patch
+Patch2:         eclipse-ptp-repository.patch
 
 # Remove some unneeded dependencies
 BuildRequires:  java-devel >= 1.5.0
@@ -49,16 +46,17 @@ BuildRequires:  maven-local
 # Need tycho-extras for core/org.eclipse.ptp.doc.isv
 BuildRequires:  tycho-extras
 BuildRequires:  eclipse-cdt-parsers >= %{cdtreq}
-#BuildRequires: eclipse-cdt-tests
-# >= 1:6.0.2
+BuildRequires:  eclipse-license
 BuildRequires:  eclipse-jgit
 BuildRequires:  eclipse-pde >= %{pdereq}
 BuildRequires:  eclipse-photran-intel
 BuildRequires:  eclipse-photran-xlf
 BuildRequires:  eclipse-rse >= %{rsereq}
+BuildRequires:  eclipse-remote
 BuildRequires:  lpg-java-compat = 1.1.0
 
 Requires:       eclipse-cdt >= %{cdtreq}
+Requires:       eclipse-remote
 # Pulled in by rdt.remotetools being in ptp main
 Requires:       %{name}-rdt = %{version}-%{release}
 Provides:       %{name}-cdt-compilers = %{version}-%{release}
@@ -328,14 +326,16 @@ Provides support for remote services using RSE.
 
 %prep
 %setup -q -n org.eclipse.ptp-%{ptp_git_tag}
-# Fix tycho version
-tychover=$(sed -ne '/<version>/{s/.*>\(.*\)<.*/\1/;p;q}' < /usr/share/maven-fragments/tycho)
-sed -i -e "/tycho-version/s/>[0-9].*</>${tychover}</" pom.xml
-%patch0 -p1 -b .notrax
-%patch1 -p2 -b .noremote
-%patch3 -p2 -b .tycho-build
-%patch5 -p1 -b .repository
+
+%patch0 -p2 -b .noremote
+%patch1 -p2 -b .tycho-build
+%patch2 -p1 -b .repository
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
+
+# Remove dep on ant-trax
+%pom_remove_dep ant:ant-trax rdt/org.eclipse.ptp.rdt.core.remotejars
+%pom_remove_dep ant:ant-trax rms/org.eclipse.ptp.rm.lml.da.server
+
 # Remove bundled binaries
 rm -r releng/org.eclipse.ptp.linux/os/linux
 # Remotejars requires a bunch of downloaded prebuilt stuff
@@ -358,8 +358,9 @@ sh BUILD
 popd
 mkdir -p releng/org.eclipse.ptp.linux/os/linux/%{_arch}
 cp -p debug/org.eclipse.ptp.debug.sdm/bin/sdm releng/org.eclipse.ptp.linux/os/linux/%{_arch}/sdm
+
 # Build the project
-mvn-rpmbuild -DforceContextQualifier=%{ptp_build_id} install
+xmvn -o clean verify
 
 
 %install
@@ -369,29 +370,31 @@ mkdir -p %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/{features,plugins}
 for jar in releng/org.eclipse.ptp.repo/target/repository/features/*.jar
 do
   name=$(basename $jar .jar)
-  # Skip photran components
+  # Skip external components
   [ ${name/org.eclipse.photran/} != $name ] && continue
   [ ${name/org.eclipse.rephraserengine/} != $name ] && continue
+  [ ${name/org.eclipse.remote/} != $name ] && continue
   unzip -u -d %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/features/$name $jar
-  if [ $name == org.eclipse.ptp_%{version}.%{ptp_build_id} ]
+  files="files.${name%.*}"
+  if [[ $name == org.eclipse.ptp_%{version}.* ]]
   then
     # Group the core features
-    sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_base}/dropins/ptp/eclipse/features/\1_*#gp' %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/features/$name/feature.xml | tail -n +2 > files.$name
+    sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_base}/dropins/ptp/eclipse/features/\1_*#gp' %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/features/$name/feature.xml | tail -n +2 > $files
     # Add the plugins for those features
     sed -ne '/id=/s#.*"\(.*\)"#\1#gp' %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/features/$name/feature.xml | tail -n +2 | while read f
     do
       [ $f == org.eclipse.ptp ] && continue
-      sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_base}/dropins/ptp/eclipse/plugins/\1_*.jar#gp' %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/features/${f}_*/feature.xml | tail -n +2 >> files.$name
+      sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_base}/dropins/ptp/eclipse/plugins/\1_*.jar#gp' %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/features/${f}_*/feature.xml | tail -n +2 >> $files
     done
-    sort -u -o files.$name files.$name
+    sort -u -o $files $files
   else
-    sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_base}/dropins/ptp/eclipse/plugins/\1_*.jar#gp' %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/features/$name/feature.xml | tail -n +2 > files.$name
+    sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_base}/dropins/ptp/eclipse/plugins/\1_*.jar#gp' %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/features/$name/feature.xml | tail -n +2 > $files
   fi
 done
 cp -u releng/org.eclipse.ptp.repo/target/repository/plugins/*.jar \
    %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/plugins/
-# Remove photran plugins
-rm %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/plugins/org.eclipse.{photran,rephraserengine}*
+# Remove external plugins
+rm %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/plugins/org.eclipse.{photran,rephraserengine,remote}*
 
 # Remove disabled modules from filelist
 sed -i -e '\,plugins/org.eclipse.ptp.remote.remotetools_,d' \
@@ -403,87 +406,92 @@ mkdir -p %{buildroot}%{_libdir}/ptp
 cp -p debug/org.eclipse.ptp.debug.sdm/bin/sdm %{buildroot}%{_libdir}/ptp/
 
 
-%files -f files.org.eclipse.ptp_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files -f files.org.eclipse.ptp_%{version} -f files.org.eclipse.ptp.etfw.feedback.perfsuite_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %dir %{eclipse_base}/dropins/ptp
 %dir %{eclipse_base}/dropins/ptp/eclipse
 %dir %{eclipse_base}/dropins/ptp/eclipse/features
 %dir %{eclipse_base}/dropins/ptp/eclipse/plugins
+%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.feedback.perfsuite_*
 
 %files master
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 
-%files core-source -f files.org.eclipse.ptp.core.source_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files core-source -f files.org.eclipse.ptp.core.source_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.core.source_*
 
-%files etfw-tau -f files.org.eclipse.ptp.etfw.tau_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files etfw-tau -f files.org.eclipse.ptp.etfw.tau_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.tau_*
 
-%files etfw-tau-fortran -f files.org.eclipse.ptp.etfw.tau.fortran_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files etfw-tau-fortran -f files.org.eclipse.ptp.etfw.tau.fortran_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.tau.fortran_*
 
 %files fortran
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.fortran_*
 
-%files gem -f files.org.eclipse.ptp.gem_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files gem -f files.org.eclipse.ptp.gem_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.gem_*
 
 # GIG was disabled for 7.0 release for now
 %if 0
-%files gig -f files.org.eclipse.ptp.gig_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files gig -f files.org.eclipse.ptp.gig_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.gig_*
 %endif
 
-%files pldt-fortran -f files.org.eclipse.ptp.pldt.fortran_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files pldt-fortran -f files.org.eclipse.ptp.pldt.fortran_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.pldt.fortran_*
 
-%files pldt-upc -f files.org.eclipse.ptp.pldt.upc_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files pldt-upc -f files.org.eclipse.ptp.pldt.upc_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.pldt.upc_*
 
-%files rdt -f files.org.eclipse.ptp.rdt_%{version}.%{ptp_build_id} -f files.org.eclipse.ptp.rdt.editor_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files rdt -f files.org.eclipse.ptp.rdt_%{version} -f files.org.eclipse.ptp.rdt.editor_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt_*
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt.editor_*
 
-%files rdt-sync-fortran -f files.org.eclipse.ptp.rdt.sync.fortran_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files rdt-sync-fortran -f files.org.eclipse.ptp.rdt.sync.fortran_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt.sync.fortran_*
 
-%files rdt-xlc -f files.org.eclipse.ptp.rdt.xlc_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files rdt-xlc -f files.org.eclipse.ptp.rdt.xlc_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt.xlc_*
 
-%files remote-rse -f files.org.eclipse.ptp.remote.rse_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files remote-rse -f files.org.eclipse.ptp.remote.rse_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.remote.rse_*
 
-%files rm-contrib -f files.org.eclipse.ptp.rm.jaxb.contrib_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files rm-contrib -f files.org.eclipse.ptp.rm.jaxb.contrib_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rm.jaxb.contrib_*
 
-%files sci -f files.org.eclipse.ptp.sci_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files sci -f files.org.eclipse.ptp.sci_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.sci_*
 
-%files sdk -f files.org.eclipse.ptp.sdk_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files sdk -f files.org.eclipse.ptp.sdk_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.sdk_*
 
-%files sdm -f files.org.eclipse.ptp.debug.sdm_%{version}.%{ptp_build_id}
-%doc releng/org.eclipse.ptp.license-feature/epl-v10.html
+%files sdm -f files.org.eclipse.ptp.debug.sdm_%{version}
+%doc releng/org.eclipse.ptp-feature/epl-v10.html
 %{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.debug.sdm_*
 %{_libdir}/ptp/
 
 
 %changelog
+* Tue Aug 19 2014 Mat Booth <mat.booth at redhat.com> - 8.0.0-1
+- Update to latest upstream release
+- Fix FTBFS rhbz #1106199
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

More information about the scm-commits mailing list