Merge branch 'master' into f17

This commit is contained in:
Dan Mashal 2012-11-22 19:48:19 -08:00
commit 8a50d80ba2
1 changed files with 4 additions and 3 deletions

View File

@ -1,7 +1,6 @@
Name: mate-settings-daemon
Version: 1.5.3
Release: 1%{?dist}
Release: 2%{?dist}
Summary: MATE Desktop settings daemon
License: GPLv2+
URL: http://mate-desktop.org
@ -10,7 +9,6 @@ Source0: http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.
BuildRequires: pkgconfig(clutter-gst-1.0)
BuildRequires: icon-naming-utils
BuildRequires: mate-common
BuildRequires: pkgconfig(MateCORBA-2.0)
BuildRequires: pkgconfig(mate-desktop-2.0)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gtk+-2.0)
@ -97,6 +95,9 @@ fi
%changelog
* Thu Nov 22 2012 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.3-2
- drop mate-corba from br as it is deprecated
* Mon Oct 29 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.5.3-1
- update to 1.5.3 release