rpms/eclipse/devel eclipse.spec,1.485,1.486

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24645

Modified Files:
	eclipse.spec 
Log Message:
* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-20
- Move requirements on subclipse, cdt, mylyn, etc. to comps.xml.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- eclipse.spec	10 Sep 2007 13:36:32 -0000	1.485
+++ eclipse.spec	18 Sep 2007 15:56:57 -0000	1.486
@@ -23,7 +23,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        19%{?dist} 
+Release:        20%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -224,18 +224,6 @@
 Requires: lucene-contrib >= 1.9.1
 Requires: regexp
 Requires: eclipse-cvs-client
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-# no CDT -> no changelog -> no rpm-editor
-# (upstream does not support ppc64)
-%ifnarch ppc64 alpha
-Requires: eclipse-subclipse
-Requires: eclipse-changelog
-Requires: eclipse-rpm-editor
-Requires: eclipse-mylyn
-Requires: eclipse-mylyn-ide
-Requires: eclipse-mylyn-bugzilla
-Requires: eclipse-mylyn-trac
 %endif
 
 %description    platform
@@ -260,11 +248,6 @@
 %else
 Requires:       java-javadoc >= 1.6.0
 %endif
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64 alpha
-Requires:       eclipse-mylyn-java
-%endif
 %if %{gcj_support}
 Requires(post):     java-gcj-compat >= 1.0.64
 Requires(postun):   java-gcj-compat >= 1.0.64
@@ -296,11 +279,6 @@
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       %{name}-pde-runtime = %{epoch}:%{version}-%{release}
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64 alpha
-Requires:       eclipse-mylyn-pde
-%endif
 Requires(post):    %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun):  %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(post):    %{name}-jdt = %{epoch}:%{version}-%{release}
@@ -1579,6 +1557,9 @@
 %endif
 
 %changelog
+* Tue Sep 18 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-20
+- Move requirements on subclipse, cdt, mylyn, etc. to comps.xml.
+
 * Mon Sep 10 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-19
 - Don't require subclipse, cdt, or rpm-editor on ppc64.