packages: caribou/caribou.spec - conflicts before split

[glen]

Author: glen                         Date: Sat Mar  3 21:23:35 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- conflicts before split

---- Files affected:
packages/caribou:
   caribou.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/caribou/caribou.spec
diff -u packages/caribou/caribou.spec:1.9 packages/caribou/caribou.spec:1.10
--- packages/caribou/caribou.spec:1.9	Fri Mar  2 20:23:22 2012
+++ packages/caribou/caribou.spec	Sat Mar  3 22:23:30 2012
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Klawiatura ekranowa
 Name:		caribou
 Version:	0.4.1
-Release:	2
+Release:	3
 License:	LGPL v2+
 Group:		X11/Applications/Accessibility
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/caribou/0.4/%{name}-%{version}.tar.xz
@@ -32,12 +32,12 @@
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	xz
 Requires(post,postun):	glib2 >= 1:2.26.0
+Requires(postun):	/sbin/ldconfig
 Requires:	clutter >= 1.6.0
 Requires:	gobject-introspection >= 0.10.7
 Requires:	python-modules
 Requires:	python-pyatspi >= 2.2.0
 Requires:	python-pygobject3 >= 3.0.0
-Requires(postun): /sbin/ldconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -75,6 +75,7 @@
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gtk+2
+Conflicts:	%{name} < 0.4.1-2
 
 %description gtk2-module
 This package contains caribou im module for Gtk2.
@@ -84,6 +85,7 @@
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gtk+3
+Conflicts:	%{name} < 0.4.1-2
 
 %description gtk3-module
 This package contains caribou im module for Gtk3.
@@ -92,6 +94,7 @@
 Summary:	Keyboard implementation for %{name}
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
+Conflicts:	%{name} < 0.4.1-2
 
 %description antler
 This package contains caribou keyboard implementation.
@@ -180,6 +183,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2012/03/03 21:23:30  glen
+- conflicts before split
+
 Revision 1.9  2012/03/02 19:23:22  glen
 - split package to subpackages -gtk2-module, -gtk3-module, -antler and python-caribou
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/caribou/caribou.spec?r1=1.9&r2=1.10&f=u