rpms/eclipse/devel eclipse.spec,1.474,1.475
Ben Konrath (bkonrath)
fedora-extras-commits at redhat.com
Thu Aug 30 20:37:33 UTC 2007
Author: bkonrath
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10723
Modified Files:
eclipse.spec
Log Message:
* Thu Aug 30 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-13
- Move *-sdk subpackages to pde subpackage.
- Add BuildRequires: libXt-devel for IcedTea build.
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -r1.474 -r1.475
--- eclipse.spec 30 Aug 2007 19:54:32 -0000 1.474
+++ eclipse.spec 30 Aug 2007 20:37:01 -0000 1.475
@@ -23,7 +23,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 12%{?dist}
+Release: 13%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -97,6 +97,7 @@
BuildRequires: java-gcj-compat-devel >= 1.0.64
%else
BuildRequires: java-devel >= 1.6.0
+BuildRequires: libXt-devel
%endif
# Need to investigate why we don't build ant-apache-bsf or ant-commons-net in
@@ -178,16 +179,6 @@
%description rcp
Eclipse Rich Client Platform
-%package rcp-sdk
-Summary: Eclipse Rich Client Platform SDK
-Group: Text Editors/Integrated Development Environments (IDE)
-Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release}
-
-%description rcp-sdk
-Source for Eclipse Rich Client Platform for use within Eclipse.
-
%package cvs-client
Summary: Eclipse CVS Client
Group: Text Editors/Integrated Development Environments (IDE)
@@ -198,16 +189,6 @@
%description cvs-client
Eclipse CVS Client
-%package cvs-client-sdk
-Summary: Eclipse Rich Client Platform SDK
-Group: Text Editors/Integrated Development Environments (IDE)
-Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-cvs-client = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-cvs-client = %{epoch}:%{version}-%{release}
-
-%description cvs-client-sdk
-Source for Eclipse CVS Client for use within Eclipse.
-
%package platform
Summary: Eclipse platform common files
Group: Text Editors/Integrated Development Environments (IDE)
@@ -253,19 +234,10 @@
The Eclipse Platform is the base of all IDE plugins. This does not include the
Java Development Tools or the Plugin Development Environment.
-%package platform-sdk
-Summary: Eclipse Platform SDK
-Group: Text Editors/Integrated Development Environments (IDE)
-Requires: %{name}-platform = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
-
-%description platform-sdk
-Source and docs for Eclipse Platform for use within Eclipse.
-
%package jdt
Summary: Eclipse Java Development Tools
Group: Text Editors/Integrated Development Environments (IDE)
+Provides: eclipse
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release}
Requires: %{name}-ecj = %{epoch}:%{version}-%{release}
@@ -290,28 +262,13 @@
Eclipse Java Development Tools. This package is required to use Eclipse for
developing software written in the Java programming language.
-%package jdt-sdk
-Summary: Eclipse Java Development Tools SDK
-Group: Text Editors/Integrated Development Environments (IDE)
-Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release}
-
-%description jdt-sdk
-Source and docs for Eclipse Java Development Tools for use within Eclipse.
-
%package pde
Summary: Eclipse Plugin Development Environment
Group: Text Editors/Integrated Development Environments (IDE)
-Provides: eclipse
Provides: eclipse-sdk
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
Requires: %{name}-pde-runtime = %{epoch}:%{version}-%{release}
-Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
-Requires: %{name}-cvs-client-sdk = %{epoch}:%{version}-%{release}
-Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
-Requires: %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
# no xmlrpc3 -> no mylyn on ppc64 due to:
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
%ifnarch ppc64 alpha
@@ -319,18 +276,10 @@
%endif
Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release}
Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
Requires(post): %{name}-pde-runtime = %{epoch}:%{version}-%{release}
Requires(postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-cvs-client-sdk = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-cvs-client-sdk = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires(post): java-gcj-compat >= 1.0.64
Requires(postun): java-gcj-compat >= 1.0.64
@@ -1249,14 +1198,8 @@
%postun -n %{libname}-gtk2 -p %{_bindir}/rebuild-gcj-db
%post rcp -p %{_bindir}/rebuild-gcj-db
%postun rcp -p %{_bindir}/rebuild-gcj-db
-%post rcp-sdk -p %{_bindir}/rebuild-gcj-db
-%postun rcp-sdk -p %{_bindir}/rebuild-gcj-db
-%post platform-sdk -p %{_bindir}/rebuild-gcj-db
-%postun platform-sdk -p %{_bindir}/rebuild-gcj-db
%post jdt -p %{_bindir}/rebuild-gcj-db
%postun jdt -p %{_bindir}/rebuild-gcj-db
-%post jdt-sdk -p %{_bindir}/rebuild-gcj-db
-%postun jdt-sdk -p %{_bindir}/rebuild-gcj-db
%post pde -p %{_bindir}/rebuild-gcj-db
%postun pde -p %{_bindir}/rebuild-gcj-db
%post pde-runtime -p %{_bindir}/rebuild-gcj-db
@@ -1365,12 +1308,6 @@
%{_libdir}/gcj/%{name}/org.eclipse.core.databinding.beans_*
%endif
-%files rcp-sdk
-%defattr(-,root,root)
-%{_datadir}/%{name}/features/org.eclipse.rcp.source_*
-%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{eclipse_arch}*
-%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_*
-
%files cvs-client
%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_*
%{_datadir}/%{name}/plugins/org.eclipse.cvs_*
@@ -1385,10 +1322,6 @@
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_*
%endif
-%files cvs-client-sdk
-%{_datadir}/%{name}/plugins/org.eclipse.cvs.source_*
-%{_datadir}/%{name}/features/org.eclipse.cvs.source_*
-
%files platform -f %{name}-platform.install
%defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/%{name}
@@ -1527,25 +1460,6 @@
%{_libdir}/gcj/%{name}/universal.jar.*
%endif
-%files platform-sdk
-%defattr(-,root,root)
-%{_datadir}/%{name}/features/org.eclipse.platform.source_*
-%{_datadir}/%{name}/plugins/javax.servlet.jsp.source_*
-%{_datadir}/%{name}/plugins/javax.servlet.source_*
-%{_datadir}/%{name}/plugins/org.apache.ant.source_*
-%{_datadir}/%{name}/plugins/org.apache.commons.el.source_*
-%{_datadir}/%{name}/plugins/org.apache.commons.logging.source_*
-%{_datadir}/%{name}/plugins/org.apache.jasper.source_*
-%{_datadir}/%{name}/plugins/org.apache.lucene.analysis.source_*
-%{_datadir}/%{name}/plugins/org.apache.lucene.source_*
-%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_*
-%{_libdir}/%{name}/plugins/org.eclipse.platform.source_*
-%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_*
-%{_datadir}/%{name}/plugins/org.mortbay.jetty.source_*
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.platform.doc.isv_*
-%endif
-
%files jdt
%defattr(-,root,root)
%{_bindir}/efj
@@ -1584,13 +1498,6 @@
%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
%endif
-%files jdt-sdk
-%defattr(-,root,root)
-%{_datadir}/%{name}/features/org.eclipse.jdt.source_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_*
-%{_datadir}/%{name}/plugins/org.junit.source_*
-
%files pde
%defattr(-,root,root)
%{_datadir}/%{name}/features/org.eclipse.sdk_*
@@ -1604,8 +1511,30 @@
%{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*
%{_datadir}/%{name}/plugins/org.eclipse.pde.ui_*
%{_datadir}/%{name}/plugins/org.eclipse.pde.ui.templates_*
+%{_datadir}/%{name}/features/org.eclipse.rcp.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{eclipse_arch}*
+%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_*
%{_datadir}/%{name}/plugins/org.eclipse.pde.source_*
+%{_datadir}/%{name}/features/org.eclipse.cvs.source_*
+%{_datadir}/%{name}/plugins/org.eclipse.cvs.source_*
%{_datadir}/%{name}/plugins/org.eclipse.sdk_*
+%{_datadir}/%{name}/features/org.eclipse.jdt.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_*
+%{_datadir}/%{name}/plugins/org.junit.source_*
+%{_datadir}/%{name}/features/org.eclipse.platform.source_*
+%{_datadir}/%{name}/plugins/javax.servlet.jsp.source_*
+%{_datadir}/%{name}/plugins/javax.servlet.source_*
+%{_datadir}/%{name}/plugins/org.apache.ant.source_*
+%{_datadir}/%{name}/plugins/org.apache.commons.el.source_*
+%{_datadir}/%{name}/plugins/org.apache.commons.logging.source_*
+%{_datadir}/%{name}/plugins/org.apache.jasper.source_*
+%{_datadir}/%{name}/plugins/org.apache.lucene.analysis.source_*
+%{_datadir}/%{name}/plugins/org.apache.lucene.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_*
+%{_datadir}/%{name}/plugins/org.mortbay.jetty.source_*
%{_datadir}/%{name}/buildscripts
%if %{gcj_support}
%{_libdir}/gcj/%{name}/org.eclipse.pde_*
@@ -1613,6 +1542,7 @@
%{_libdir}/gcj/%{name}/org.eclipse.pde.junit.runtime_*
%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.pde.ui.templates_*
+%{_libdir}/gcj/%{name}/org.eclipse.platform.doc.isv_*
%{_libdir}/gcj/%{name}/pdebuild.jar*
%{_libdir}/gcj/%{name}/pdebuild-ant.jar*
%endif
@@ -1625,6 +1555,10 @@
%endif
%changelog
+* Thu Aug 30 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-13
+- Move *-sdk subpackages to pde subpackage.
+- Add BuildRequires: libXt-devel for IcedTea build.
+
* Tue Aug 28 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-12
- Require mylyn on all archs except ppc64 alpha.
- Use IcedTea on x86_64 and x86.
More information about the scm-commits
mailing list