- Use new java-1.4.2-gcj-compat-javadoc package.
- Always generate debug info when building RPMs (Andrew Haley).
This commit is contained in:
parent
dedf2228a1
commit
6f1b5380ba
21
eclipse.spec
21
eclipse.spec
@ -22,7 +22,7 @@ Epoch: 1
|
|||||||
Summary: %{pkg_summary}
|
Summary: %{pkg_summary}
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 1jpp_4fc
|
Release: 1jpp_5fc
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -108,6 +108,8 @@ Patch46: %{name}-libswt-xpcomgcc4.patch
|
|||||||
Patch47: %{name}-launcher-link.patch
|
Patch47: %{name}-launcher-link.patch
|
||||||
# Don't attempt to link to Sun's javadocs
|
# Don't attempt to link to Sun's javadocs
|
||||||
Patch48: %{name}-javadoclinks.patch
|
Patch48: %{name}-javadoclinks.patch
|
||||||
|
# Always generate debug info when building RPMs (Andrew Haley)
|
||||||
|
Patch49: %{name}-ecj-rpmdebuginfo.patch
|
||||||
|
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
ExcludeArch: ppc64 s390 s390x
|
ExcludeArch: ppc64 s390 s390x
|
||||||
@ -130,6 +132,7 @@ BuildRequires: nspr-devel
|
|||||||
BuildRequires: libXtst-devel
|
BuildRequires: libXtst-devel
|
||||||
BuildRequires: cairo >= 1.0
|
BuildRequires: cairo >= 1.0
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
|
BuildRequires: java-javadoc
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
BuildRequires: gcc-java >= 4.0.2
|
BuildRequires: gcc-java >= 4.0.2
|
||||||
BuildRequires: java-gcj-compat-devel >= 1.0.43
|
BuildRequires: java-gcj-compat-devel >= 1.0.43
|
||||||
@ -196,6 +199,7 @@ Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
|
|||||||
Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
||||||
Requires: /usr/bin/perl
|
Requires: /usr/bin/perl
|
||||||
Requires: /usr/bin/mozilla
|
Requires: /usr/bin/mozilla
|
||||||
|
Requires: java-javadoc
|
||||||
|
|
||||||
PreReq: gtk2 >= 2.6
|
PreReq: gtk2 >= 2.6
|
||||||
|
|
||||||
@ -413,7 +417,18 @@ pushd features/org.eclipse.platform.launchers
|
|||||||
%patch37 -p1
|
%patch37 -p1
|
||||||
%patch47 -p1
|
%patch47 -p1
|
||||||
popd
|
popd
|
||||||
|
# Link against our system-installed javadocs
|
||||||
%patch48 -p0
|
%patch48 -p0
|
||||||
|
pushd plugins/org.eclipse.jdt.doc.isv
|
||||||
|
sed --in-place "s:/usr/share/:%{_datadir}/:g" jdtOptions
|
||||||
|
popd
|
||||||
|
pushd plugins/org.eclipse.pde.doc.user
|
||||||
|
sed --in-place "s:/usr/share/:%{_datadir}/:g" pdeOptions
|
||||||
|
popd
|
||||||
|
pushd plugins/org.eclipse.platform.doc.isv
|
||||||
|
sed --in-place "s:/usr/share/:%{_datadir}/:g" platformOptions
|
||||||
|
popd
|
||||||
|
%patch49 -p0
|
||||||
|
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
# Fedora splash screen.
|
# Fedora splash screen.
|
||||||
@ -1258,6 +1273,10 @@ fi
|
|||||||
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
|
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 07 2006 Andrew Overholt <overholt@redhat.com> 3.1.2-1jpp_5fc
|
||||||
|
- Use new java-1.4.2-gcj-compat-javadoc package.
|
||||||
|
- Always generate debug info when building RPMs (Andrew Haley).
|
||||||
|
|
||||||
* Mon Feb 06 2006 Andrew Overholt <overholt@redhat.com> 3.1.2-1jpp_4fc
|
* Mon Feb 06 2006 Andrew Overholt <overholt@redhat.com> 3.1.2-1jpp_4fc
|
||||||
- Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000).
|
- Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000).
|
||||||
- Link against generic libjawt.so (rh#158755).
|
- Link against generic libjawt.so (rh#158755).
|
||||||
|
Loading…
Reference in New Issue
Block a user