[eclipse-ptp] Drop ppw package; remove disabled module components from file lists
Orion Poplawski
orion at fedoraproject.org
Fri Apr 12 15:43:37 UTC 2013
commit ea5553d16aa80408205b8910337811857d488a73
Author: Orion Poplawski <orion at nwra.com>
Date: Fri Apr 12 09:43:34 2013 -0600
Drop ppw package; remove disabled module components from file lists
eclipse-ptp.spec | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 0c96750..dd95442 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -69,6 +69,8 @@ BuildArch: noarch
Requires: eclipse-cdt >= %{cdtreq}
# Pulled in by rdt.remotetools being in ptp main
Requires: %{name}-rdt = %{version}-%{release}
+Provides: %{name}-etfw-ppw = %{version}-%{release}
+Obsoletes: %{name}-etfw-ppw < %{version}-%{release}
Provides: %{name}-cdt-compilers = %{version}-%{release}
Obsoletes: %{name}-cdt-compilers < %{version}-%{release}
Provides: %{name}-pldt = %{version}-%{release}
@@ -107,7 +109,6 @@ Requires: eclipse-cdt >= %{cdtreq}
Requires: %{name} = %{version}-%{release}
#master package is a virtual package that requires all of the components
-Requires: %{name}-etfw-ppw = %{version}-%{release}
Requires: %{name}-etfw-tau = %{version}-%{release}
Requires: %{name}-etfw-tau-fortran = %{version}-%{release}
Requires: %{name}-fortran = %{version}-%{release}
@@ -128,15 +129,6 @@ Requires: eclipse-photran-xlf = %{photranver}-%{release}
The package will bring in all of the PTP components.
-%package etfw-ppw
-Summary: PTP Parallel Performance Wizard (PPW)
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description etfw-ppw
-Adds support for Parallel Performance Wizard (PPW).
-
-
%package etfw-tau
Summary: PTP External Tools Framework TAU Support
Group: Development/Libraries
@@ -407,6 +399,11 @@ cp -u org.eclipse.ptp-%{ptp_git_tag}/releng/org.eclipse.ptp.repo/target/reposito
# special case for rephraserengine feature included in photran
sed -i -e '/org.eclipse.rephraserengine_/d' files.org.eclipse.photran_%{photranver}.%{photran_build_id}
+# Remove disabled modules from filelist
+sed -i -e '\,plugins/org.eclipse.ptp.remote.remotetools_,d' \
+ -e '\,plugins/org.eclipse.ptp.remote_,d' \
+ -e '\,plugins/org.eclipse.ptp.remotetools_,d' files.*
+
%files -f files.org.eclipse.ptp_%{version}.%{ptp_build_id}
%doc epl-v10.html
@@ -418,10 +415,6 @@ sed -i -e '/org.eclipse.rephraserengine_/d' files.org.eclipse.photran_%{photranv
%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_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_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.tau_*
More information about the scm-commits
mailing list