[eclipse-ptp] The shorter the better.

Alexander Kurtakov akurtakov at fedoraproject.org
Fri Feb 8 11:05:51 UTC 2013 

commit dc56b7be3c84da85bbb4fc5144d6e2751e4a1df9
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Feb 8 13:05:41 2013 +0200

    The shorter the better.

 eclipse-ptp.spec |  111 +++++++++++++++++++-----------------------------------
 1 files changed, 39 insertions(+), 72 deletions(-)
---
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 53fa551..75fec46 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -1,15 +1,10 @@
 %global ptpver                  6.0.3
 %global photranver              8.0.3
-%global eclipse_noarch_base     %{_datadir}/eclipse
-%global eclipse_arch_base       %{_libdir}/eclipse
+%global eclipse_base            %{_datadir}/eclipse
 %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
-%else
-%global pdebuild                %{eclipse_arch_base}/buildscripts/pdebuild
-%endif
 %global ptp_build_id            201211112147
 #global ptp_git_tag             PTP_6_0_2
 %global ptp_git_tag             a0dac268418a969d9a24e8f641827238d2d5f0ce
@@ -17,22 +12,11 @@
 #global photran_git_tag         PTP_6_0_2
 %global photran_git_tag         7c45b16ff335f6d0d4fc0cc0983ec19bbffa0922
 
-# All arches line up except i386 -> x86
-%ifarch %{ix86}
-%define eclipse_arch    x86
-%else
-%ifarch %{arm}
-%define eclipse_arch    arm
-%else
-%define eclipse_arch   %{_arch}
-%endif
-%endif
-
 Summary:        Eclipse Parallel Tools Platform
 Name:           eclipse-ptp
 # Be sure to update photran version if needed
 Version:        %{ptpver}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/ptp
@@ -54,7 +38,6 @@ Patch1:         eclipse-ptp-noremotejars.patch
 
 # Remove some unneeded dependencies
 BuildRequires:  java-devel >= 1.5.0
-#BuildRequires:  eclipse-pde >= %{pdereq}
 BuildRequires:  maven-local
 BuildRequires:  tycho
 BuildRequires:  eclipse-cdt-parsers >= %{cdtreq}
@@ -103,7 +86,6 @@ This package contains the main PTP run-time features.
 %package        master
 Summary:        Complete PTP package
 Group:          Development/Libraries
-BuildArch:      noarch
 Requires:       eclipse-cdt >= %{cdtreq}
 Requires:       %{name} = %{version}-%{release}
 
@@ -133,7 +115,6 @@ The package will bring in all of the PTP components.
 Summary:        PTP Parallel Performance Wizard (PPW)
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
 
 %description    etfw-ppw
 Adds support for Parallel Performance Wizard (PPW).
@@ -143,7 +124,6 @@ Adds support for Parallel Performance Wizard (PPW).
 Summary:        PTP External Tools Framework TAU Support
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
 
 %description    etfw-tau
 Extends the external tools framework with capabilities specific
@@ -155,7 +135,6 @@ Summary:        PTP External Tools Framework: TAU Fortran Enabler
 Group:          Development/Libraries
 Requires:       %{name}-etfw-tau = %{version}-%{release}
 Requires:       eclipse-photran = %{photranver}-%{release}
-BuildArch:      noarch
 
 %description    etfw-tau-fortran
 Adds selective instrumentation functionality for Fortran via the
@@ -172,7 +151,6 @@ Requires:       %{name}-rdt-sync-fortran = %{version}-%{release}
 Requires:       eclipse-photran = %{photranver}-%{release}
 Requires:       eclipse-photran-intel = %{photranver}-%{release}
 Requires:       eclipse-photran-xlf = %{photranver}-%{release}
-BuildArch:      noarch
 
 %description    fortran
 Adds Fortran support to PTP.
@@ -182,7 +160,6 @@ Adds Fortran support to PTP.
 Summary:        PTP Graphical Explorer of MPI Programs (GEM)
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
 
 %description    gem
 GEM serves as a graphical front end for In-situ Partial Order (ISP), a
@@ -206,7 +183,6 @@ Group:          Development/Libraries
 Requires:       eclipse-cdt-parsers >= %{cdtreq}
 Requires:       %{name} = %{version}-%{release}
 Requires:       eclipse-photran = %{photranver}-%{release}
-BuildArch:      noarch
 
 %description    pldt-fortran
 Adds a range of static analysis and programming assistance tools for Fortran.
@@ -217,7 +193,6 @@ Summary:        PTP Parallel Language Development Tools UPC Support
 Group:          Development/Libraries
 Requires:       eclipse-cdt-parsers >= %{cdtreq}
 Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
 
 %description    pldt-upc
 Adds a range of static analysis and programming assistance tools for UPC.  
@@ -231,7 +206,6 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       eclipse-jgit
 Requires:       eclipse-rse >= %{rsereq}
-BuildArch:      noarch
 
 %description    rdt
 PTP components for supporting Remote Development Tools.
@@ -241,7 +215,6 @@ PTP components for supporting Remote Development Tools.
 Summary:        PTP Fortran Synchronization Support
 Group:          Development/Libraries
 Requires:       %{name}-rdt-sync = %{version}-%{release}
-BuildArch:      noarch
 
 %description    rdt-sync-fortran
 Adds the ability to remotely synchronize Fortran projects.
@@ -252,7 +225,6 @@ Summary:        PTP Remote Development Tools XL C/C++ Compiler Support
 Group:          Development/Libraries
 Requires:       %{name}-rdt = %{version}-%{release}
 Requires:       eclipse-cdt-parsers >= %{cdtreq}
-BuildArch:      noarch
 
 %description    rdt-xlc
 Remote support for the IBM XL C/C++ compilers.
@@ -262,7 +234,6 @@ Remote support for the IBM XL C/C++ compilers.
 Summary:        PTP Contributed Resource Manager Definitions
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
 
 %description    rm-contrib
 Adds resource managers for a number of different systems.
@@ -271,7 +242,6 @@ Adds resource managers for a number of different systems.
 %package        sci
 Summary:        PTP Scalable Communication Infrastructure (SCI)
 Group:          Development/Libraries
-BuildArch:      noarch
 
 %description    sci
 Parallel Tools Platform components that implements the Scalable Communication
@@ -281,7 +251,6 @@ Infrastructure (SCI).
 %package        sdk
 Summary:        Parallel Tools Platform SDK 
 Group:          Development/Libraries
-BuildArch:      noarch
 
 %description    sdk
 Eclipse Parallel Tools Platform. Software development kit including source
@@ -293,7 +262,6 @@ Version:        %{photranver}
 Summary:        Photran End-User Runtime
 Group:          Development/Libraries
 Requires:       eclipse-cdt >= %{cdtreq}
-BuildArch:      noarch
 
 %description -n eclipse-photran
 An Eclipse-based Integrated Development Environment for Fortran.
@@ -304,7 +272,6 @@ Version:        %{photranver}
 Summary:        Intel Fortran compiler support for Photran
 Group:          Development/Libraries
 Requires:       eclipse-photran = %{photranver}-%{release}
-BuildArch:      noarch
 
 %description -n eclipse-photran-intel
 This feature packages the plugins required to support
@@ -316,7 +283,6 @@ Version:        %{photranver}
 Summary:        IBM XLF Compiler Support
 Group:          Development/Libraries
 Requires:       eclipse-photran = %{photranver}-%{release}
-BuildArch:      noarch
 
 %description -n eclipse-photran-xlf
 Error parser and managed build tool chain for the IBM XLF compiler.
@@ -327,7 +293,6 @@ Version:        %{ptpver}
 Summary:        PTP RSE Enabler
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
 
 %description    remote-rse
 Provides support for remote services using RSE.
@@ -387,31 +352,30 @@ popd
 
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/{features,plugins}
+mkdir -p %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/{features,plugins}
 
 # ptp
 for jar in org.eclipse.ptp-%{ptp_git_tag}/releng/org.eclipse.ptp.repo/target/repository/features/*.jar
 do
   name=$(basename $jar .jar)
-  unzip -u -d %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/features/$name $jar
+  unzip -u -d %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/features/$name $jar
   if [ $name == org.eclipse.ptp_%{version}.%{ptp_build_id} ]
   then
     # Group the core features
-    sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_noarch_base}/dropins/ptp/eclipse/features/\1_*#gp' %{buildroot}%{eclipse_noarch_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.$name
     # Add the plugins for those features
-    sed -ne '/id=/s#.*"\(.*\)"#\1#gp' %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/features/$name/feature.xml | tail -n +2 | while read f
+    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_noarch_base}/dropins/ptp/eclipse/plugins/\1_*.jar#gp' %{buildroot}%{eclipse_noarch_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.$name
     done
     sort -u -o files.$name files.$name
   else
-    sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_noarch_base}/dropins/ptp/eclipse/plugins/\1_*.jar#gp' %{buildroot}%{eclipse_noarch_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.$name
   fi
 done
 cp -u org.eclipse.ptp-%{ptp_git_tag}/releng/org.eclipse.ptp.repo/target/repository/plugins/*.jar \
-   %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/plugins/
+   %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/plugins/
 
 # special case for rephraserengine feature included in photran
 sed -i -e '/org.eclipse.rephraserengine_/d' files.org.eclipse.photran_%{photranver}.%{photran_build_id}
@@ -419,90 +383,93 @@ sed -i -e '/org.eclipse.rephraserengine_/d' files.org.eclipse.photran_%{photranv
 
 %files -f files.org.eclipse.ptp_%{version}.%{ptp_build_id}
 %doc epl-v10.html
-%dir %{eclipse_noarch_base}/dropins/ptp
-%dir %{eclipse_noarch_base}/dropins/ptp/eclipse
-%dir %{eclipse_noarch_base}/dropins/ptp/eclipse/features
-%dir %{eclipse_noarch_base}/dropins/ptp/eclipse/plugins
+%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
 
 %files master
 %doc epl-v10.html
 
 %files etfw-ppw -f files.org.eclipse.ptp.etfw.ppw_%{version}.%{ptp_build_id}
 %doc epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.ppw_*
+%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.ppw_*
 
 %files etfw-tau -f files.org.eclipse.ptp.etfw.tau_%{version}.%{ptp_build_id}
 %doc epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.tau_*
+%{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 epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.tau.fortran_*
+%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.tau.fortran_*
 
 %files fortran
 %doc epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.fortran_*
+%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.fortran_*
 
 %files gem -f files.org.eclipse.ptp.gem_%{version}.%{ptp_build_id}
 %doc epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.gem_*
+%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.gem_*
 
 %files pldt-fortran -f files.org.eclipse.ptp.pldt.fortran_%{version}.%{ptp_build_id}
 %doc epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.pldt.fortran_*
+%{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 epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.pldt.upc_*
+%{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 epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt_*
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt.editor_*
+%{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 epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt.sync.fortran_*
+%{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 epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt.xlc_*
+%{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 epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.remote.rse_*
+%{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 epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rm.jaxb.contrib_*
+%{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 epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.sci_*
+%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.sci_*
 
 %files sdk -f files.org.eclipse.ptp.sdk_%{version}.%{ptp_build_id}
 %doc epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.sdk_*
+%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.sdk_*
 
 %files -n eclipse-photran -f files.org.eclipse.photran_%{photranver}.%{photran_build_id} -f files.org.eclipse.rephraserengine_%{photranver}.%{photran_build_id}
 %doc epl-v10.html
-%dir %{eclipse_noarch_base}/dropins/ptp
-%dir %{eclipse_noarch_base}/dropins/ptp/eclipse
-%dir %{eclipse_noarch_base}/dropins/ptp/eclipse/features
-%dir %{eclipse_noarch_base}/dropins/ptp/eclipse/plugins
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.photran_*
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.rephraserengine_*
+%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.photran_*
+%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.rephraserengine_*
 
 %files -n eclipse-photran-intel -f files.org.eclipse.photran.intel_%{photranver}.%{photran_build_id}
 %doc epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.photran.intel_*
+%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.photran.intel_*
 
 %files -n eclipse-photran-xlf -f files.org.eclipse.photran.xlf_%{photranver}.%{photran_build_id}
 %doc epl-v10.html
-%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.photran.xlf_*
+%{eclipse_base}/dropins/ptp/eclipse/features/org.eclipse.photran.xlf_*
 
 
 %changelog
+* Fri Feb 8 2013 Alexander Kurtakov <akurtako at redhat.com> 6.0.3-4
+- Remove a lot of old stuff.
+
 * Wed Feb 06 2013 Java SIG <java-devel at lists.fedoraproject.org> - 6.0.3-3
 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
 - Replace maven BuildRequires with maven-local

More information about the scm-commits mailing list