[mate-control-center] fix conflicts

Dan Mashal vicodan at fedoraproject.org
Wed Jan 16 19:55:11 UTC 2013


commit 5699b33af71392f38c67aeaf3f5fe74c336f3a0f
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Wed Jan 16 11:54:53 2013 -0800

    fix conflicts

 mate-control-center.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/mate-control-center.spec b/mate-control-center.spec
index 57394e9..dfbb253 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,11 +1,12 @@
 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-2
+Obsoletes: mate-control-center-1.5.2
+Obsoletes: libslab
 
 BuildRequires: desktop-file-utils
 BuildRequires: icon-naming-utils
@@ -144,6 +145,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.
 


More information about the scm-commits mailing list