[mate-window-manager] Fix update of GSettings enum preferences and rework spec

[Dan Mashal]

commit 0f45682e93a00eba057a0d62b0711d33ad0c6287
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Fri Jan 11 16:39:27 2013 -0800

    Fix update of GSettings enum preferences and rework spec

 mate-window-manager.spec |   71 ++++++++++++++++++++++------------------------
 1 files changed, 34 insertions(+), 37 deletions(-)
---
diff --git a/mate-window-manager.spec b/mate-window-manager.spec
index 8ed37eb..5e8e87a 100644
--- a/mate-window-manager.spec
+++ b/mate-window-manager.spec
@@ -1,43 +1,30 @@
-%{?filter_setup:
-%filter_from_requires /^libmarco-private.so/d;
-%filter_setup
-}
-
-
 Name:           mate-window-manager
 Version:        1.5.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        MATE Desktop window manager
 License:        LGPLv2+ and GPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-# https://bugzilla.gnome.org/show_bug.cgi?id=622517
-Patch0:         Allow-breaking-out-from-maximization-during-mouse.patch
-# https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/583847
-Patch1:         initialise_all_workspace_names.patch
 
-# upstream patch
-# https://github.com/mate-desktop/mate-window-manager/commit/6404a98fb79e7bb4c3e9c5ca9919e12c946679d7
-Patch2:         0001-fix-startup-rendering-effect-with-composite-enabled.patch
+#Upstream patch to fix update of GSettings enum preferences 
+patch0: fix_gsettings_update.patch
+
 
 BuildRequires: desktop-file-utils
-BuildRequires: pkgconfig(gtk+-2.0)
-BuildRequires: pkgconfig(libcanberra)
-BuildRequires: pkgconfig(libsoup-2.4)
+BuildRequires: gtk2-devel
+BuildRequires: libcanberra-devel
+BuildRequires: libsoup-devel
 BuildRequires: mate-common
-BuildRequires: pkgconfig(mate-doc-utils)
-BuildRequires: pkgconfig(gsettings-desktop-schemas)
-BuildRequires: pkgconfig(MateCORBA-2.0)
+BuildRequires: mate-doc-utils
+BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: mate-dialogs
-BuildRequires: pkgconfig(sm)
-BuildRequires: pkgconfig(ice)
-BuildRequires: pkgconfig(libstartup-notification-1.0)
-BuildRequires: pkgconfig(xdamage)
+BuildRequires: libSM-devel
+BuildRequires: startup-notification-devel
+BuildRequires: libXdamage-devel
+BuildRequires: rarian-devel
+BuildRequires: rarian-compat
 
-Requires:      gsettings-desktop-schemas
-
-
-Obsoletes: mate-window-manager-libs < 1.4.1-2
+Obsoletes: %{name} < %{version}-%{release}
 
 # http://bugzilla.redhat.com/873342
 Provides: firstboot(windowmanager) = mate-window-manager
@@ -57,16 +44,16 @@ Development files for mate-window-manager
 %setup -q
 %patch0 -p1
 #patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 
 %build
-%configure --disable-static	\
-	--disable-scrollkeeper	\
-	--with-gnu-ld		\
-	--with-gtk=2.0		\
-	--with-x
+%configure --disable-static         \
+           --disable-scrollkeeper   \
+           --with-gnu-ld            \
+           --with-gtk=2.0           \
+           --with-x
 
 make %{?_smp_mflags} V=1
 
@@ -78,11 +65,12 @@ find %{buildroot} -name '*.la' -exec rm -vf {} ';'
 
 desktop-file-install                                \
         --remove-category="MATE"                    \
+        --add-category="X-Mate"                     \
         --delete-original                           \
         --dir=%{buildroot}%{_datadir}/applications  \
 %{buildroot}%{_datadir}/applications/marco.desktop
 
-%find_lang %{name} --all-name
+%find_lang marco
 
 
 %post
@@ -98,7 +86,7 @@ fi
     /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
-%files -f %{name}.lang
+%files -f marco.lang
 %doc AUTHORS COPYING README
 %{_bindir}/marco
 %{_bindir}/marco-message
@@ -118,6 +106,7 @@ fi
 %{_datadir}/mate/help/creating-marco-themes/C/creating-marco-themes.xml
 %{_datadir}/mate/wm-properties/
 %{_datadir}/glib-2.0/schemas/org.mate.marco.gschema.xml
+%{_datadir}/MateConf/gsettings/marco.convert
 %{_libdir}/libmarco-private.so.0*
 %{_mandir}/man1/marco.1.*
 %{_mandir}/man1/marco-message.1.*
@@ -125,7 +114,7 @@ fi
 %files devel
 %{_bindir}/marco-theme-viewer
 %{_bindir}/marco-window-demo
-%{_includedir}/marco-1/
+%{_includedir}/marco-1
 %{_libdir}/libmarco-private.so
 %{_libdir}/pkgconfig/libmarco-private.pc
 %{_mandir}/man1/marco-theme-viewer.1.*
@@ -133,6 +122,14 @@ fi
 
 
 %changelog
+* Fri Jan 11 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.2-11
+- Convert back to old BR format
+- Drop unneeded BRs
+- Own directories that are supposed to be owned (marco-1)
+- Fix missing "X-Mate" category.
+- Add gsettings data convert file for users upgrading from 1.4
+- Fix update of gsettings enum preferences
+
 * Mon Dec 10 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.2-10
 - Rebuild for ARM