[mate-settings-daemon] Undo last commit and move it to mate-desktop

[Dan Mashal]

commit 92526b1ead8741fec9ea641e88af38c10663ad77
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Wed Oct 9 17:03:21 2013 -0700

    Undo last commit and move it to mate-desktop

 caja-attack.gschema.override |    5 -----
 mate-settings-daemon.spec    |   12 ++----------
 2 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index e069bed..e294550 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -12,7 +12,6 @@ URL:            http://mate-desktop.org
 # To generate tarball
 # wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz
 Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz
-Source1: x-caja-desktop-fix.override
 
 Requires:       libmatekbd%{?_isa} >= 0:1.6.1-1
 # needed for xrandr capplet
@@ -53,11 +52,11 @@ NOCONFIGURE=1 ./autogen.sh
 
 %build
 %configure                             \
-   --enable-pulse                     \
+   --enable-pulse                      \
    --disable-static                    \
    --disable-schemas-compile           \
    --enable-polkit                     \
-   --disable-gstreamer                  \
+   --disable-gstreamer                 \
    --with-x                            \
    --with-nssdb
 
@@ -73,12 +72,8 @@ rm -f %{buildroot}%{_datadir}/MateConf/gsettings/mate-settings-daemon.convert
 
 desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
 
-install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/caja-attack.gschema.override
-
-
 %find_lang %{name}
 
-
 %post
 /sbin/ldconfig
 /bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
@@ -118,9 +113,6 @@ fi
 %{_libdir}/pkgconfig/mate-settings-daemon.pc
 
 %changelog
-* Wed Oct 09 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.2-0.4.gitd2d3aa7
-- Hopefully fix bug 886029
-
 * Thu Oct 03 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-0.3.gitd2d3aa7
 - enable pulsaudio support