packages (DEVEL): gnome-settings-daemon/gnome-settings-daemon.spec - confli...

[wiget]

Author: wiget                        Date: Sun Sep 25 16:47:24 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- conflicts with older gnome-color-manager
- rel. 2

---- Files affected:
packages/gnome-settings-daemon:
   gnome-settings-daemon.spec (1.39.2.8 -> 1.39.2.9) 

---- Diffs:

================================================================
Index: packages/gnome-settings-daemon/gnome-settings-daemon.spec
diff -u packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.39.2.8 packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.39.2.9
--- packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.39.2.8	Sun Sep 25 13:08:26 2011
+++ packages/gnome-settings-daemon/gnome-settings-daemon.spec	Sun Sep 25 18:47:19 2011
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Demon ustawień GNOME
 Name:		gnome-settings-daemon
 Version:	3.1.92
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications
@@ -56,6 +56,7 @@
 Requires:	hicolor-icon-theme
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
+Conflicts:	gnome-color-manager < 3.1.92-1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -199,6 +200,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39.2.9  2011/09/25 16:47:19  wiget
+- conflicts with older gnome-color-manager
+- rel. 2
+
 Revision 1.39.2.8  2011/09/25 11:08:26  kiesiu
 - use pnp.ids from gnome-desktop
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-settings-daemon/gnome-settings-daemon.spec?r1=1.39.2.8&r2=1.39.2.9&f=u