From 022520241bdfe2f416f0472e12f7bb5af82b16ea Mon Sep 17 00:00:00 2001
From: Dan Mashal <dan.mashal@fedoraproject.org>
Date: Fri, 8 Feb 2013 14:49:07 -0800
Subject: [PATCH] update to latest upstream release

---
 .gitignore                |  1 +
 mate-settings-daemon.spec | 42 +++++++++++++++++++++------------------
 sources                   |  2 +-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1f85b08..5fcdc66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /mate-settings-daemon-1.5.0.tar.xz
 /mate-settings-daemon-1.5.3.tar.xz
 /mate-settings-daemon-1.5.4.tar.xz
+/mate-settings-daemon-1.5.5.tar.xz
diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index 33e5bca..b62aeb4 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -1,29 +1,28 @@
 Name:           mate-settings-daemon
-Version:        1.5.4
-Release:        3%{?dist}
+Version:        1.5.5
+Release:        1%{?dist}
 Summary:        MATE Desktop settings daemon
 License:        GPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-Requires:       gsettings-desktop-schemas
 Requires:       mate-icon-theme
 
+BuildRequires:  clutter-gst-devel
+BuildRequires:  dbus-glib-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  gsettings-desktop-schemas-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  icon-naming-utils
+BuildRequires:  libSM-devel
+BuildRequires:  libmatekbd-devel
+BuildRequires:  libmatenotify-devel
+BuildRequires:  libxklavier-devel
 BuildRequires:  mate-common
-BuildRequires:  pkgconfig(clutter-gst-1.0)
-BuildRequires:  pkgconfig(dbus-glib-1)
-BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(gsettings-desktop-schemas)
-BuildRequires:  pkgconfig(gstreamer-0.10)
-BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
-BuildRequires:  pkgconfig(libmatekbd)
-BuildRequires:  pkgconfig(libmatenotify)
-BuildRequires:  pkgconfig(libxklavier)
-BuildRequires:  pkgconfig(mate-desktop-2.0)
-BuildRequires:  pkgconfig(nss)
-BuildRequires:  pkgconfig(polkit-agent-1)
-BuildRequires:  pkgconfig(polkit-gtk-mate-1)
-BuildRequires:  pkgconfig(sm)
+BuildRequires:  mate-doc-utils
+BuildRequires:  mate-desktop-devel
+BuildRequires:  mate-polkit-devel
+BuildRequires:  nss-devel
 
 %description
 This package contains the daemon which is responsible for setting the
@@ -91,16 +90,21 @@ fi
 %{_datadir}/dbus-1/services/org.mate.SettingsDaemon.service
 %{_datadir}/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
 %{_datadir}/icons/mate/*/*/*
-%{_datadir}/mate-settings-daemon/
+%{_datadir}/mate-settings-daemon
 %{_datadir}/glib-2.0/schemas/org.mate.*.xml
 %{_datadir}/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy
+%{_datadir}/MateConf/gsettings/mate-settings-daemon.convert
 
 %files devel
 %{_includedir}/mate-settings-daemon/
 %{_libdir}/pkgconfig/mate-settings-daemon.pc
 
-
 %changelog
+* Fri Feb 08 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.5-1
+-Update to latest upstream release
+-Convert back to old BR style
+-Own dirs we are supposed to own
+
 * Tue Jan 15 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.4-3
 - Fix icon scriptlets
 
diff --git a/sources b/sources
index 5bad455..60b4276 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d60acd136d4d7b273dc5cb6033beba98  mate-settings-daemon-1.5.4.tar.xz
+d0c02b1a8cee205bccf1bd237d21d82a  mate-settings-daemon-1.5.5.tar.xz