[mate-desktop] Update to 1.7.1

[Dan Mashal]

commit b7c0f0ff486c09b2e72339373cb1cbd261714fd5
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Wed Dec 4 12:21:08 2013 -0800

    Update to 1.7.1

 .gitignore        |    1 +
 mate-desktop.spec |   67 ++++++++++++++++++++++++++---------------------------
 sources           |    2 +-
 3 files changed, 35 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d9313d0..bdd5b7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /mate-desktop-1.6.1.tar.xz
 /mate-desktop-1.7.0.tar.xz
 /mate-desktop-1.6.2.git81c245b.tar.xz
+/mate-desktop-1.7.1.tar.xz
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 8d81d43..da920e5 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -1,30 +1,23 @@
-%global _internal_version  81c245b
-
 Summary:        Shared code for mate-panel, mate-session, mate-file-manager, etc
 Name:           mate-desktop
-Version:        1.6.2
-Release:        0.12.git%{_internal_version}%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 URL:            http://mate-desktop.org
-
-# To generate tarball
-# wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz
-Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz
-
-#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
-Source2:        gnu-cat.gif
-Source3:        gnu-cat_navideno_v3.png
-Source4:        mate-fedora-f20.gschema.override
+#Source1:        mate-fedora.gschema.override
+#Source2:        gnu-cat.gif
+#Source3:        gnu-cat_navideno_v3.png
+#Source4:        mate-fedora-f20.gschema.override
 #enable gnucat
-Patch0:         mate-desktop_enable_gnucat.patch
-
+#Patch0:         mate-desktop_enable_gnucat.patch
 
 License:        GPLv2+ and LGPLv2+ and MIT
 
+BuildRequires:  dconf-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  itstool
 BuildRequires:  mate-common
 BuildRequires:  mate-doc-utils
 BuildRequires:  startup-notification-devel
@@ -97,14 +90,16 @@ Libraries and header files for the MATE-internal private library
 libmatedesktop.
 
 %prep
-%setup -q -n %{name}-%{_internal_version}
-%patch0 -p1 -b .gnucat
-cp %SOURCE2 mate-about/gnu-cat.gif
-cp %SOURCE3 mate-about/gnu-cat_navideno_v3.png
-NOCONFIGURE=1 ./autogen.sh
+%setup -q -n %{name}-%{version}
+#%patch0 -p1 -b .gnucat
+#cp %SOURCE2 mate-about/gnu-cat.gif
+#cp %SOURCE3 mate-about/gnu-cat_navideno_v3.png
 
 %build
+#We are using disable-desktop-docs because docbook docs configure with Gnome 3
+#https://github.com/mate-desktop/mate-desktop/issues/68
 %configure \
+     --disable-desktop-docs                                \
      --disable-scrollkeeper                                \
      --disable-schemas-compile                             \
      --with-gtk=2.0                                        \
@@ -113,7 +108,7 @@ NOCONFIGURE=1 ./autogen.sh
      --enable-unique                                       \
      --with-pnp-ids-path="%{_datadir}/hwdata/pnp.ids"      \
      --with-omf-dir=%{_datadir}/omf/mate-desktop           \
-     --enable-gnucat
+     --enable-gtk-doc-html
 
 make %{?_smp_mflags} V=1
 
@@ -129,16 +124,16 @@ desktop-file-install                                         \
         --dir=%{buildroot}%{_datadir}/applications           \
 %{buildroot}%{_datadir}/applications/mate-about.desktop
 
-%if 0%{?fedora} > 19
-install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
-%else
-install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
-%endif
+#%if 0%{?fedora} > 19
+#install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
+#%else
+#install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
+#%endif
 
 # remove needless gsettings convert file to avoid slow session start
 rm -f  %{buildroot}%{_datadir}/MateConf/gsettings/mate-desktop.convert
 
-%find_lang %{name}
+%find_lang %{name} --with-gnome --all-name
 
 
 %post libs -p /sbin/ldconfig
@@ -166,14 +161,15 @@ fi
 %{_bindir}/mate-about
 %{_bindir}/mate-gsettings-toggle
 %{_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/mate-fedora.gschema.override
+#%{_datadir}/glib-2.0/schemas/mate-fedora.gschema.override
 %{_mandir}/man1/*
 %doc %{_datadir}/gtk-doc/html/mate-desktop
-%{_datadir}/pixmaps/gnu-cat.gif
-%{_datadir}/pixmaps/gnu-cat_navideno_v3.png
+#%{_datadir}/pixmaps/gnu-cat.gif
+#%{_datadir}/pixmaps/gnu-cat_navideno_v3.png
+%{_datadir}/help/*/mate-user-guide
 
 %files libs -f %{name}.lang
 %{_libdir}/libmate-desktop-2.so.*
@@ -186,6 +182,9 @@ fi
 
 
 %changelog
+* Wed Dec 04 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.1-1
+- Update to 1.7.1
+
 * Thu Nov 21 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-0.12.git81c245b
 - BlueMenta is now default theme in fedora 20
 
diff --git a/sources b/sources
index 6c5980f..a09f606 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-622d34246777b864354bd7d226acfa71  mate-desktop-1.6.2.git81c245b.tar.xz
+37ddfe3db4387d4c77217e1e5e771c43  mate-desktop-1.7.1.tar.xz