From b28d4a10903c50253f236aba9f6c113cd8dc16c0 Mon Sep 17 00:00:00 2001
From: Nelson Marques <nmo.marques@gmail.com>
Date: Fri, 21 Dec 2012 14:56:57 +0000
Subject: [PATCH] fix gstreamer support and minor improvements

---
 mate-settings-daemon.spec | 57 ++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index 7caf729..7045619 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -1,39 +1,43 @@
 Name:           mate-settings-daemon
 Version:        1.5.4
-Release:        1%{?dist}
+Release:        2%{?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:  pkgconfig(clutter-gst-1.0)
 BuildRequires:  icon-naming-utils
 BuildRequires:  mate-common
-BuildRequires:  pkgconfig(mate-desktop-2.0)
+BuildRequires:  pkgconfig(clutter-gst-1.0)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(sm)
+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(gsettings-desktop-schemas)
-
-Requires: gsettings-desktop-schemas
-Requires: mate-icon-theme
-
+BuildRequires:  pkgconfig(sm)
 
 %description
-MATE Desktop settings daemon
+This package contains the daemon which is responsible for setting the
+various parameters of a MATE session and the applications that run
+under it.
 
 %package devel
 Summary:        Development files for mate-settings-daemon
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
-Development files for mate-settings-daemon
+This package contains the daemon which is responsible for setting the
+various parameters of a MATE session and the applications that run
+under it.
 
 %prep
 %setup -q
@@ -41,28 +45,24 @@ NOCONFIGURE=1 ./autogen.sh
 
 
 %build
-%configure \
-    --with-x  \
-    --enable-gstreamer  \
-    --enable-polkit  \
-    --disable-schemas-compile  \
-    --with-gnu-ld  \
-    --with-x  \
-    --with-nssdb  \
-
+%configure                             \
+   --disable-pulse                     \
+   --disable-static                    \
+   --disable-schemas-compile           \
+   --enable-polkit                     \
+   --enable-gstreamer                  \
+   --with-x                            \
+   --with-gnu-ld                       \
+   --with-nssdb
 make %{?_smp_mflags} V=1
 
 
 %install
 make install DESTDIR=%{buildroot}
-
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
-
 %find_lang %{name}
 
 
-
 %post
 /sbin/ldconfig
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -79,6 +79,7 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
+
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
 %config %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
@@ -100,6 +101,14 @@ fi
 
 
 %changelog
+* Fri Dec 21 2012 Nelson Marques <nmarques@fedoraproject.org> - 1.5.4-2
+- Fix broken gstreamer support:
+  + add gstreamer BuildRequires
+  + disable pulse so we build with gstreamer support
+- Add '--disable-static' to %%configure and remove find entries
+- Improve description, overall readability, order dependencies and
+  minor improvements
+
 * Mon Dec 03 2012 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.4-1
 - Latest upstream release