- Rpmlint cleanups.
This commit is contained in:
Ben Konrath
parent
7d9cdcb3fb
commit
8342665f19
98
eclipse.spec
98
eclipse.spec
|
|
@ -19,8 +19,8 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 27%{?dist}
|
||||
License: EPL
|
||||
Release: 28%{?dist}
|
||||
License: Eclipse Public License
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.2.1-200609210945/eclipse-sourceBuild-srcIncluded-3.2.1.zip
|
||||
|
|
@ -156,7 +156,8 @@ BuildRequires: lucene-devel
|
|||
BuildRequires: regexp
|
||||
BuildRequires: junit >= 3.8.1-3jpp
|
||||
%if %{gcj_support}
|
||||
Requires(post,postun): java-gcj-compat >= 1.0.64
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
|
@ -168,11 +169,12 @@ JavaBeans(tm).
|
|||
%package ecj
|
||||
Summary: Eclipse Compiler for Java
|
||||
Group: Development/Languages
|
||||
Obsoletes: ecj
|
||||
Provides: ecj
|
||||
Obsoletes: ecj <= 2.1.3
|
||||
Provides: ecj <= 2.1.3
|
||||
%if %{gcj_support}
|
||||
Requires: libgcj >= 4.0.2
|
||||
Requires(post,postun): java-gcj-compat >= 1.0.64
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%else
|
||||
Requires: java >= 1.4.2
|
||||
%endif
|
||||
|
|
@ -185,7 +187,8 @@ Summary: SWT Library for GTK+-2.0
|
|||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
%if %{gcj_support}
|
||||
Requires: libgcj >= 4.0.2
|
||||
Requires(post,postun): java-gcj-compat >= 1.0.64
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%endif
|
||||
Requires: gtk2
|
||||
Requires: firefox
|
||||
|
|
@ -200,10 +203,12 @@ Group: Development/Languages
|
|||
Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
||||
# This file-level requirement is for the bi-arch multilib case
|
||||
Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar
|
||||
Requires(post,postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
||||
%if %{gcj_support}
|
||||
Requires: libgcj >= 4.0.2
|
||||
Requires(post,postun): java-gcj-compat >= 1.0.64
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%else
|
||||
Requires: java >= 1.4.2
|
||||
%endif
|
||||
|
|
@ -215,7 +220,8 @@ Eclipse Rich Client Platform
|
|||
Summary: Eclipse Rich Client Platform SDK
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{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.
|
||||
|
|
@ -224,12 +230,14 @@ Source for Eclipse Rich Client Platform for use within Eclipse.
|
|||
Summary: Eclipse platform common files
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
%if %{gcj_support}
|
||||
Requires(post,postun): java-gcj-compat >= 1.0.64
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%endif
|
||||
Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
|
||||
# This file-level requirement is for the bi-arch multilib case
|
||||
Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar
|
||||
Requires(post,postun): %{name}-rcp = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release}
|
||||
# Need to investigate why we don't build ant-apache-bsf or ant-commons-net in
|
||||
# Fedora. When that's done, add it here and symlink below.
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
|
||||
|
|
@ -253,8 +261,10 @@ Summary: Eclipse Platform SDK
|
|||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description platform-sdk
|
||||
Source and docs for Eclipse Platform for use within Eclipse.
|
||||
|
|
@ -264,12 +274,15 @@ Summary: Eclipse Java Development Tools
|
|||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-ecj = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-ecj = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-ecj = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-ecj = %{epoch}:%{version}-%{release}
|
||||
Requires: junit >= 3.8.1-3jpp
|
||||
Requires: java-javadoc
|
||||
%if %{gcj_support}
|
||||
Requires(post,postun): java-gcj-compat >= 1.0.64
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%endif
|
||||
|
||||
%description jdt
|
||||
|
|
@ -281,8 +294,10 @@ Summary: Eclipse Java Development Tools SDK
|
|||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description jdt-sdk
|
||||
Source and docs for Eclipse Java Development Tools for use within Eclipse.
|
||||
|
|
@ -293,11 +308,15 @@ Group: Text Editors/Integrated Development Environments (IDE)
|
|||
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-pde-runtime = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-pde-runtime = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
%if %{gcj_support}
|
||||
Requires(post,postun): java-gcj-compat >= 1.0.64
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%endif
|
||||
|
||||
%description pde
|
||||
|
|
@ -308,9 +327,11 @@ developing Eclipse plugins.
|
|||
Summary: Eclipse Plugin Development Environment runtime plugin.
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
%if %{gcj_support}
|
||||
Requires(post,postun): java-gcj-compat >= 1.0.64
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%endif
|
||||
|
||||
%description pde-runtime
|
||||
|
|
@ -321,7 +342,8 @@ Summary: Eclipse Plugin Development Environment SDK
|
|||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Requires: %{name}-pde = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-pde = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-pde = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-pde = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description pde-sdk
|
||||
Source and docs for Eclipse Plugin Development Environment for use within
|
||||
|
|
@ -333,13 +355,18 @@ Group: Text Editors/Integrated Development Environments (IDE)
|
|||
Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-pde-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-pde-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post,postun): %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-pde-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-pde-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
# This file requirement is to deal with the biarch installation case
|
||||
Requires(post,postun): %{_libdir}/%{name}/configuration/config.ini
|
||||
Requires(post): %{_libdir}/%{name}/configuration/config.ini
|
||||
Requires(postun): %{_libdir}/%{name}/configuration/config.ini
|
||||
%if %{gcj_support}
|
||||
Requires(post,postun): java-gcj-compat >= 1.0.64
|
||||
Requires(post): java-gcj-compat >= 1.0.64
|
||||
Requires(postun): java-gcj-compat >= 1.0.64
|
||||
%endif
|
||||
|
||||
%description sdk
|
||||
|
|
@ -1711,6 +1738,9 @@ fi
|
|||
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
||||
|
||||
%changelog
|
||||
* Wed Jan 10 2007 Ben Konrath <bkonrath@redhat.com> 3.2.1-28
|
||||
- Rpmlint cleanups.
|
||||
|
||||
* Fri Jan 05 2007 Ben Konrath <bkonrath@redhat.com> 3.2.1-27
|
||||
- Use /g in tomcat version replacement.
|
||||
- Disable com.jcraft.jsch_0.1.28.jar and
|
||||
|
|
@ -1872,11 +1902,11 @@ fi
|
|||
- Use new swt-firefox patch and consolidate others into one.
|
||||
|
||||
* Wed Sep 27 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-0.RC.3
|
||||
- Fix typo in %postun of -sdk and -platform.
|
||||
- Fix typo in %%postun of -sdk and -platform.
|
||||
- Disable help index generation on ia64.
|
||||
|
||||
* Tue Sep 26 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-0.RC.2
|
||||
- Don't set eclipse.product incorrectly in %postun of -sdk and -platform.
|
||||
- Don't set eclipse.product incorrectly in %%postun of -sdk and -platform.
|
||||
|
||||
* Mon Sep 25 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-0.RC.1
|
||||
- M20060921-0945 (3.2.1 pre-release).
|
||||
|
|
@ -1916,7 +1946,7 @@ fi
|
|||
- Re-add customBuildCallbacks.xml-add-pre.gather.bin.parts.patch because
|
||||
it has not been applied upstream.
|
||||
- Minor spec file clean ups.
|
||||
- Add %{name} to the -devel package Provides so that upgrading from
|
||||
- Add %%{name} to the -devel package Provides so that upgrading from
|
||||
FC-5 to FC-6 works.
|
||||
- Re-enable natively compiling the ant.ui plugin.
|
||||
- Re-enable natively compiling the team.cvs.core plugin on ia64.
|
||||
|
|
|
|||
Loading…
Reference in New Issue