[mate-window-manager] fix dependencies, update to latest git version, update licensing in specfile

[Dan Mashal]

commit d99c09a4e9500b8ac521b50a506cb4613e067512
Author: dan <dan at DGM.hsd1.ca.comcast.net>
Date:   Sun Sep 9 21:46:27 2012 -0700

    fix dependencies, update to latest git version, update licensing in specfile

 .gitignore               |    1 +
 mate-window-manager.spec |   40 +++++++++++++++++++++++++---------------
 sources                  |    2 +-
 3 files changed, 27 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b940c62..8b60132 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /mate-window-manager-1.4.0.tar.xz
 /mate-window-manager-1.4.1.tar.xz
+/mate-window-manager-1.4.1.tar.gz
diff --git a/mate-window-manager.spec b/mate-window-manager.spec
index 44b4fb2..d64aaf0 100644
--- a/mate-window-manager.spec
+++ b/mate-window-manager.spec
@@ -1,29 +1,28 @@
 Name:		mate-window-manager
 Version:	1.4.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	MATE Desktop window manager
-License:	LGPLv2+ GPLv2+
+License:	LGPLv2+ and GPLv2+
 URL:		http://mate-desktop.org
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://vicodan.fedorapeople.org/mate-window-manager-1.4.1.tar.gz
 
 BuildRequires:	desktop-file-utils gtk2-devel libcanberra-devel libsoup-devel mate-common mate-doc-utils mate-conf-devel mate-corba-devel mate-dialogs 
-
-Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+Requires:	mate-desktop
+Requires:	mate-conf
 Requires(pre):	mate-conf
 Requires(post):	mate-conf
 Requires(preun):	mate-conf
 
-Obsoletes: mate-window-manager < 1.4.1-1
-Obsoletes: mate-window-manager-devel < 1.4.1-1
-Obsoletes: mate-window-manager-libs < 1.4.1-1
+Obsoletes: mate-window-manager < 1.4.1-3
+Obsoletes: mate-window-manager-devel < 1.4.1-3
+Obsoletes: mate-window-manager-libs < 1.4.1-2
 
 %description
 MATE Desktop window manager
 
-
 %package devel
 Summary: Development files for mate-window-manager
-Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Development files for mate-window-manager
@@ -48,24 +47,32 @@ find %{buildroot} -name '*.la' -exec rm -vf {} ';'
 
 desktop-file-install									\
 	--remove-category="MATE"							\
-	--add-category="X-Mate"								\
-%if 0%{?fedora} < 18
+	--add-category="X-MATE"								\
 	--remove-only-show-in="MATE"							\
 	--add-only-show-in="X-MATE"							\
-%endif
 	--delete-original								\
 	--dir=%{buildroot}%{_datadir}/applications					\
 %{buildroot}%{_datadir}/applications/marco.desktop
-#%{buildroot}%{_datadir}/mate/wm-properties/marco-wm.desktop
+
+desktop-file-install									\
+	--remove-category="MATE"							\
+	--add-category="X-MATE"								\
+	--remove-only-show-in="MATE"							\
+	--add-only-show-in="X-MATE"							\
+	--delete-original								\
+	--dir=%{buildroot}%{_datadir}/mate/wm-properties				\
+%{buildroot}%{_datadir}/mate/wm-properties/marco-wm.desktop
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/marco.desktop
-#desktop-file-validate %{buildroot}%{_datadir}/mate/wm-properties/marco-wm.desktop
+desktop-file-validate %{buildroot}%{_datadir}/mate/wm-properties/marco-wm.desktop
 
 %pre
+/sbin/ldconfig
 %mateconf_schema_prepare marco
 
 %post
+/sbin/ldconfig
 %mateconf_schema_upgrade marco
 
 %postun
@@ -107,6 +114,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/marco.desktop
 
 
 %changelog
+* Sun Sep 09 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.1-3
+- Fix broken dependencies, update to latest github version which contains fixes for desktop-file-utils
+
 * Mon Sep 03 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.1-2
 - Add environment variable to install section and further obsoletes to prevent dependency breakage
 
diff --git a/sources b/sources
index 3aa8536..ca22e4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a6d5807a1ad7e014e6a54e4fcfc16b30  mate-window-manager-1.4.1.tar.xz
+7261505d3c2624efaf1c700fce1fc9cd  mate-window-manager-1.4.1.tar.gz