[mate-control-center/f16] fix conflicts

[Dan Mashal]

commit 34b430ce03c813e614a24d43b1e6b03082b7ac7b
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Wed Jan 16 12:45:46 2013 -0800

    fix conflicts

 mate-control-center.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/mate-control-center.spec b/mate-control-center.spec
index cae478f..61c587e 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,12 +1,10 @@
 Name:           mate-control-center
 Version:        1.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MATE Desktop control-center
 License:        LGPLv2+ and GPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-Obsoletes: mate-control-center-1.5.2-*
-
 BuildRequires: desktop-file-utils
 BuildRequires: icon-naming-utils
 BuildRequires: mate-common
@@ -32,7 +30,8 @@ BuildRequires: libXScrnSaver-devel
 BuildRequires: libXxf86misc-devel
 BuildRequires: libxkbfile-devel
 
-Obsoletes: %{name}-%{version}-1.5.2*
+Obsoletes: %{name}-%{version}-1
+Obsoletes: libslab
 
 # sample code block for handling distributions which cant provide
 # pkgconfig() capabilities - according to Dan: %%{?fedora} < 17
@@ -144,6 +143,9 @@ fi
 %{_libdir}/pkgconfig/libslab.pc
 
 %changelog
+* Wed Jan 16 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.3-2
+- Fix conflicts
+
 * Tue Jan 15 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.3-1
 - Update to latest upstream release.