[mate-desktop] remove omf directory hack and do it properly

[leigh123linux]

commit b5802bd5d43224dbe53acb6bda177da0fe6c6be7
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Nov 15 17:56:36 2012 +0000

    remove omf directory hack and do it properly

 mate-desktop.spec |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 4a6a270..6c8b26b 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -1,7 +1,7 @@
 Summary:	Shared code for mate-panel, mate-session, mate-file-manager, etc
 Name:		mate-desktop
 Version:	1.5.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://mate-desktop.org
 Source0:	http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
 Source1:        user-dirs-update-mate.desktop
@@ -58,7 +58,8 @@ NOCONFIGURE=1 ./autogen.sh
 	--with-pnp-ids-path="%{_datadir}/hwdata/pnp.ids"	\
 	--enable-unique						\
 	--enable-gnucat						\
-	--enable-gtk-doc
+	--enable-gtk-doc                                        \
+        --with-omf-dir=%{_datadir}/omf/mate-desktop
 
 make %{?_smp_mflags} V=1
 
@@ -68,11 +69,6 @@ make install DESTDIR=%{buildroot} INSTALL='install -p'
 find %{buildroot}  -name '*.la' -exec rm -f {} ';'
 
 
-# to avoid conflicts with gnome
-mkdir %{buildroot}%{_datadir}/omf/mate
-mv -f %{buildroot}%{_datadir}/omf/{fdl,gpl,lgpl} %{buildroot}%{_datadir}/omf/mate
-
-
 desktop-file-install \
 	--remove-category="MATE"					\
 	--add-category="X-Mate"						\
@@ -103,7 +99,7 @@ fi
 %{_sysconfdir}/xdg/autostart/user-dirs-update-mate.desktop
 %{_datadir}/applications/mate-about.desktop
 %{_datadir}/mate/help/*/*/*.xml
-%{_datadir}/omf/mate/
+%{_datadir}/omf/mate-desktop/
 %{_datadir}/mate-about/
 %{_datadir}/glib-2.0/schemas/org.mate.*.gschema.xml
 %{_mandir}/man1/mate-about.1*
@@ -120,6 +116,9 @@ fi
 
 
 %changelog
+* Thu Nov 15 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.3-5
+- remove omf directory hack and do it properly
+
 * Wed Nov 14 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.3-4
 - add requires xdg-user-dirs-gtk
 - set default directories