rpms/gtk2/devel gtk2.spec,1.138,1.139

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15930

Modified Files:
	gtk2.spec 
Log Message:
fix up requirements



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gtk2.spec	9 May 2006 01:25:31 -0000	1.138
+++ gtk2.spec	9 May 2006 01:44:22 -0000	1.139
@@ -42,6 +42,12 @@
 Obsoletes: gtk+-gtkbeta
 Obsoletes: Inti
 
+# Conflicts with packages containing theme engines
+# built against the 2.4.0 ABI
+Conflicts: gtk2-engines < 2.7.4-7
+Conflicts: libgnomeui < libgnomeui-2.15.1cvs20060505-2
+Conflicts: redhat-artwork < 0.243-1
+
 URL: http://www.gtk.org
 
 # required for icon themes apis to work
@@ -262,7 +268,8 @@
 
 %changelog
 * Mon May  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.0-3
-- Bump required versions of GLib, Pango and cairo.
+- Bump required versions of GLib, Pango and cairo
+- Add conflicts to force updating theme engine packages
 
 * Fri May  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.0-1
 - Update to 2.9.0