[mate-desktop] revert cahanges for 1.7

[Wolfgang Ulbrich]

commit e3eefcce29c4437653e53cb13462c405b28c929a
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Jul 27 14:22:36 2013 +0200

    revert cahanges for 1.7

 mate-desktop.spec |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/mate-desktop.spec b/mate-desktop.spec
index f62f500..41892b9 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.7.0
-Release:        1%{?dist}
+Version:        1.6.1
+Release:        8%{?dist}
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.7/%{name}-%{version}.tar.xz
 # fix fedora backgrounds and
@@ -26,8 +26,6 @@ BuildRequires:  pangox-compat-devel
 BuildRequires:  startup-notification-devel
 BuildRequires:  unique-devel
 
-#Conflicts with gnome-desktop-3 yelp files
-Conflicts: gnome-desktop-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: redhat-menus
 Requires: pygtk2
@@ -134,8 +132,8 @@ fi
 %{_bindir}/mate-about
 #%{_sysconfdir}/xdg/autostart/user-dirs-update-mate.desktop
 %{_datadir}/applications/mate-about.desktop
-#%{_datadir}/mate
-#%{_datadir}/omf/mate-desktop
+%{_datadir}/mate
+%{_datadir}/omf/mate-desktop
 %{_datadir}/mate-about
 %{_datadir}/glib-2.0/schemas/org.mate.*.gschema.xml
 %{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
@@ -153,10 +151,6 @@ fi
 %{_includedir}/mate-desktop-2.0
 
 
-%changelog
-* Sat Jul 20 2013 Dan Mashal <dan.mashal at fedoraproject.org> 1.7.0-1
-Update to latest upstream release
-
 * Sat Jun 15 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-8
 - remove gsettings convert file