- Really fix browser issue on x86_64 (rh#168040).
- Attempt to build on ia64 and ppc64 (include swt-mozilla on the latter).
This commit is contained in:
parent
2568534911
commit
99b55e9d2d
27
eclipse.spec
27
eclipse.spec
@ -23,7 +23,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_3fc
|
Release: 1jpp_4fc
|
||||||
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/
|
||||||
@ -109,7 +109,7 @@ Patch38: %{name}-buildDocPlugins.patch
|
|||||||
Patch39: %{name}-e.o111299.patch
|
Patch39: %{name}-e.o111299.patch
|
||||||
|
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
ExclusiveArch: %{ix86} x86_64 ppc
|
ExcludeArch: s390 s390x
|
||||||
%else
|
%else
|
||||||
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ia64
|
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ia64
|
||||||
%endif
|
%endif
|
||||||
@ -121,12 +121,10 @@ BuildRequires: gnome-vfs2-devel
|
|||||||
BuildRequires: gtk2-devel
|
BuildRequires: gtk2-devel
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
%ifnarch ppc64
|
|
||||||
BuildRequires: mozilla = 37:1.7.11
|
BuildRequires: mozilla = 37:1.7.11
|
||||||
BuildRequires: mozilla-devel = 37:1.7.11
|
BuildRequires: mozilla-devel = 37:1.7.11
|
||||||
BuildRequires: mozilla-nspr-devel
|
BuildRequires: mozilla-nspr-devel
|
||||||
BuildRequires: xorg-x11-devel
|
BuildRequires: xorg-x11-devel
|
||||||
%endif
|
|
||||||
%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
|
||||||
@ -363,15 +361,26 @@ popd
|
|||||||
%patch34 -p1
|
%patch34 -p1
|
||||||
%patch35 -p0
|
%patch35 -p0
|
||||||
%patch36 -p1
|
%patch36 -p1
|
||||||
pushd features/org.eclipse.platform.launchers
|
|
||||||
%patch37 -p1
|
|
||||||
popd
|
|
||||||
%patch38 -p0
|
%patch38 -p0
|
||||||
pushd plugins
|
pushd plugins
|
||||||
%patch39 -p0
|
%patch39 -p0
|
||||||
popd
|
popd
|
||||||
cp %{SOURCE21} .
|
cp %{SOURCE21} .
|
||||||
|
|
||||||
|
# Because the launcher source is zipped up, we need to unzip, patch, and re-pack
|
||||||
|
mkdir launchertmp
|
||||||
|
unzip -d launchertmp plugins/org.eclipse.platform/launchersrc.zip
|
||||||
|
pushd launchertmp
|
||||||
|
%patch37 -p1
|
||||||
|
zip -9 -r ../launchersrc.zip *
|
||||||
|
popd
|
||||||
|
mv launchersrc.zip plugins/org.eclipse.platform
|
||||||
|
rm -rf launchertmp
|
||||||
|
|
||||||
|
pushd features/org.eclipse.platform.launchers
|
||||||
|
%patch37 -p1
|
||||||
|
popd
|
||||||
|
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
# Fedora splash screen.
|
# Fedora splash screen.
|
||||||
pushd plugins/org.eclipse.platform
|
pushd plugins/org.eclipse.platform
|
||||||
@ -1166,6 +1175,10 @@ fi
|
|||||||
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
|
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 27 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_4fc
|
||||||
|
- Really fix browser issue on x86_64 (rh#168040).
|
||||||
|
- Attempt to build on ia64 and ppc64 (include swt-mozilla on the latter).
|
||||||
|
|
||||||
* Tue Oct 25 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_3fc
|
* Tue Oct 25 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_3fc
|
||||||
- Make non-gcj builds not noarch (rh#171711).
|
- Make non-gcj builds not noarch (rh#171711).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user