[mate-media: 1/2] Update to latest upstream release

[Dan Mashal]

commit 2d1c17575faaa02c7b9a618a9ca0aafccf3e108b
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Mar 26 01:13:15 2013 -0700

    Update to latest upstream release

 .gitignore      |    1 +
 mate-media.spec |   50 ++++++++++++++++++++------------------------------
 sources         |    2 +-
 3 files changed, 22 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 64638b9..27bcf92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /mate-media-1.4.0.tar.xz
 /mate-media-1.5.0.tar.xz
 /mate-media-1.5.1.tar.xz
+/mate-media-1.5.2.tar.xz
diff --git a/mate-media.spec b/mate-media.spec
index e8d1b9c..c738a71 100644
--- a/mate-media.spec
+++ b/mate-media.spec
@@ -1,34 +1,25 @@
 Name:           mate-media
-Version:        1.5.1
-Release:        3%{?dist}
+Version:        1.5.2
+Release:        1%{?dist}
 Summary:        MATE media programs
 License:        GPLv2+ and LGPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(gstreamer-0.10)
-BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
-BuildRequires:  pkgconfig(mate-default-applications)
-BuildRequires:  pkgconfig(unique-1.0)
-BuildRequires:  pkgconfig(dbus-glib-1)
-BuildRequires:  pkgconfig(libcanberra)
+BuildRequires:  clutter-gst-devel
+BuildRequires:  dbus-glib-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  libcanberra-devel
+BuildRequires:  mate-control-center-devel
 BuildRequires:  mate-doc-utils
 BuildRequires:  rarian-compat
 BuildRequires:  mate-common
 BuildRequires:  pulseaudio-libs-devel
-BuildRequires:  clutter-gst-devel
 BuildRequires:  mate-panel-devel
+BuildRequires:  unique-devel
 
-Requires(post):    desktop-file-utils
-Requires(postun):  desktop-file-utils
-
-Obsoletes:      %{name}-devel < 1.4.0-4
-
-#fix gstreamer applet
-#https://github.com/mate-desktop/mate-media/pull/15
-Patch0: commits_rollup.patch
 
 %description
 This package contains a few media utilities for the MATE desktop,
@@ -37,7 +28,6 @@ including a volume control.
 
 %prep
 %setup -q
-%patch0 -p1 -b .commit_rollup.patch
 NOCONFIGURE=1 ./autogen.sh
 
 
@@ -49,19 +39,15 @@ NOCONFIGURE=1 ./autogen.sh
         --disable-scrollkeeper \
         --enable-gst-mixer-applet \
         --enable-pulseaudio \
-        --enable-gstreamer \
-        --with-gnu-ld
-
-make V=1 %{?_smp_mflags}
+        --enable-gstreamer 
 
+make %{?_smp_mflags} V=1
 
 %install
 make DESTDIR=%{buildroot} install
 find %{buildroot} -name '*.la' -exec rm -rf {} ';'
 
 desktop-file-install                                                    \
-        --remove-category="MATE"                                        \
-        --add-category="X-Mate"                                         \
         --delete-original                                               \
         --dir=%{buildroot}%{_datadir}/applications                      \
 %{buildroot}%{_datadir}/applications/mate-volume-control.desktop
@@ -71,20 +57,20 @@ desktop-file-install                                                    \
 
 %post
 /sbin/ldconfig
-/bin/touch --no-create %{_datadir}/icons/mate &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
 /usr/bin/update-desktop-database &> /dev/null || :
 
 %postun
 /sbin/ldconfig
 /usr/bin/update-desktop-database &> /dev/null || :
 if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/mate &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &>/dev/null || :
+    /bin/touch --no-create %{_datadir}/icons/mate &> /dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
     /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 %posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
 /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
@@ -107,8 +93,12 @@ fi
 %{_datadir}/mate-panel/applets/org.mate.applets.MixerApplet.mate-panel-applet
 %{_datadir}/mate/help/mate-mixer_applet2
 %{_datadir}/omf/mate-mixer_applet2
+%{_datadir}/MateConf/gsettings/mate-volume-control.convert
 
 %changelog
+* Tue Mar 26 2013 Dan Mashal <dan.mashal at fedoraproject.org> 1.5.2-1
+- Update to latest upstream release
+
 * Sat Dec 22 2012 Nelson Marques <nmo.marques at gmail.com> - 1.5.1-3
 - mate-settings-daemon was build with gstreamer, we want to make
   sure we also have proper gstreamer support here. Only from MATE
diff --git a/sources b/sources
index b20f632..6046813 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-590e6b65c46266235271ac957694f844  mate-media-1.5.1.tar.xz
+bd6a1a8cdd84f42b81ce0130b24a149d  mate-media-1.5.2.tar.xz