rpms/eclipse/devel eclipse.spec,1.326,1.327

[fedora-cvs-commits at redhat.com]

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5314

Modified Files:
	eclipse.spec 
Log Message:
- Add Conflicts: mozilla to libswt3-gtk2 (rh bug # 207626).
- Move Requires: firefox to libswt3-gtk2.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- eclipse.spec	22 Sep 2006 16:30:52 -0000	1.326
+++ eclipse.spec	22 Sep 2006 16:59:40 -0000	1.327
@@ -196,6 +196,8 @@
 Requires(post):   java-gcj-compat >= 1.0.64
 Requires(postun): java-gcj-compat >= 1.0.64
 %endif
+Requires:       firefox
+Conflicts:     	mozilla
 
 %description -n %{libname}-gtk2
 SWT Library for GTK2.
@@ -242,7 +244,6 @@
 Requires:       %{name}-rcp = %{epoch}:%{version}-%{release}
 Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires:       /usr/bin/perl
-Requires:       firefox
 
 BuildRequires:    gtk2 >= 2.6
 Requires:         gtk2 >= 2.6
@@ -1510,6 +1511,8 @@
 - Set correct eclipse.product in post and postun of sdk and platform
   sub-packages (rh bug # 207442)
 - Don't set the .eclipseproduct twice.
+- Add Conflicts: mozilla to libswt3-gtk2 (rh bug # 207626).
+- Move Requires: firefox to libswt3-gtk2.
 
 * Thu Sep 21 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-7
 - Add workaround for gjdoc Mac-encoded bug (gcc#29167) to make javadocs build.