- Use firefox-devel instead of mozilla-devel.

- Add patch for rh#200929 (include embed_base in xpcom's pkgconfig -I
    flags).
This commit is contained in:
Andrew Overholt 2006-08-01 18:49:47 +00:00
parent e1c99230a5
commit 87cd1a4b23
1 changed files with 16 additions and 5 deletions

View File

@ -41,7 +41,7 @@ Epoch: 1
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 1jpp_9fc
Release: 1jpp_10fc
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -122,7 +122,10 @@ Patch22: %{name}-updatehomedir.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
Patch34: %{name}-bz162177.patch
# Use ecj for gcj
Patch57: %{name}-ecj-gcj.patch
Patch57: %{name}-ecj-gcj.patch
# firefox-devel's firefox-xpcom.pc needs to include -I<blah>/embed_base
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200929
Patch58: %{name}-libswt-xpcom.patch
%if %{gcj_support}
%else
@ -138,8 +141,7 @@ BuildRequires: glib2-devel
BuildRequires: libgnome-devel
BuildRequires: libgnomeui-devel
BuildRequires: gcc-c++
BuildRequires: mozilla = 37:1.7.13
BuildRequires: mozilla-devel = 37:1.7.13
BuildRequires: firefox-devel
BuildRequires: nspr-devel
BuildRequires: libXtst-devel
BuildRequires: mesa-libGL-devel
@ -218,7 +220,7 @@ Requires: java >= 1.4.2
Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release}
Requires: /usr/bin/perl
Requires: /usr/bin/mozilla
Requires: firefox
BuildRequires: gtk2 >= 2.6
Requires: gtk2 >= 2.6
@ -386,6 +388,11 @@ pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
%patch0 -p0
%patch52 -p0
popd
# firefox-devel's firefox-xpcom.pc needs to include -I<blah>/embed_base
# rh#200929
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library
%patch58 -p0
popd
%patch2 -p0
%patch4 -p0
%patch5 -p0
@ -1634,6 +1641,10 @@ fi
%endif
%changelog
* Tue Aug 01 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_10fc
- Use firefox-devel instead of mozilla-devel.
- Add patch for rh#200929 (include embed_base in xpcom's pkgconfig -I flags).
* Tue Jul 25 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-1jpp_9fc
- Use sed instead of patches for tomcat version numbers.