[mate-desktop] Update to 1.7 release

[Dan Mashal]

commit c9bf8a64ebfb3bda326b82cbec33e1f9318a650e
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sun Jul 21 13:24:18 2013 -0700

    Update to 1.7 release

 .gitignore        |    1 +
 mate-desktop.spec |   19 ++++++++++++-------
 sources           |    2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06e705f..fc14686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /mate-desktop-1.5.8.tar.xz
 /mate-desktop-1.6.0.tar.xz
 /mate-desktop-1.6.1.tar.xz
+/mate-desktop-1.7.0.tar.xz
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 640d2c2..f62f500 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -1,9 +1,9 @@
 Summary:        Shared code for mate-panel, mate-session, mate-file-manager, etc
 Name:           mate-desktop
-Version:        1.6.1
-Release:        8%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 URL:            http://mate-desktop.org
-Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
+Source0:        http://pub.mate-desktop.org/releases/1.7/%{name}-%{version}.tar.xz
 # fix fedora backgrounds and
 # workaround for x-caja-desktop window issue
 Source1:        mate-fedora.gschema.override
@@ -18,6 +18,7 @@ License:        GPLv2+ and LGPLv2+ and MIT
 BuildRequires:  desktop-file-utils
 BuildRequires:  gsettings-desktop-schemas-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  gtk-doc
 BuildRequires:  mate-common
 BuildRequires:  mate-doc-utils
@@ -25,6 +26,8 @@ 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
@@ -86,7 +89,6 @@ autoreconf -i -f
      --with-x                                              \
      --disable-static                                      \
      --enable-unique                                       \
-     --enable-gtk-doc                                      \
      --with-pnp-ids-path="%{_datadir}/hwdata/pnp.ids"      \
      --with-omf-dir=%{_datadir}/omf/mate-desktop           \
      --enable-gnucat
@@ -132,8 +134,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
@@ -141,7 +143,7 @@ fi
 %doc %{_datadir}/gtk-doc/html/mate-desktop
 %{_datadir}/pixmaps/gnu-cat.gif
 %{_datadir}/pixmaps/gnu-cat_navideno_v3.png
-
+%{_datadir}/help/*/*
 %files libs
 %{_libdir}/libmate-desktop-2.so.*
 
@@ -152,6 +154,9 @@ fi
 
 
 %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
 
diff --git a/sources b/sources
index 35f052d..3db9e62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-540936afdcd5d0a694569af9a2cac132  mate-desktop-1.6.1.tar.xz
+ef2606ed45ac30a9f27029319fab3c83  mate-desktop-1.7.0.tar.xz