[mate-control-center] Update to 1.7.0

[Dan Mashal]

commit 1ac4af642915ed1d579aaee856265126419d82d2
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Fri Dec 6 17:41:09 2013 -0800

    Update to 1.7.0

 .gitignore               |    1 +
 mate-control-center.spec |   28 +++++++++++++++++-----------
 sources                  |    2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8700efb..f13ccb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /mate-control-center-1.5.5.tar.xz
 /mate-control-center-1.6.0.tar.xz
 /mate-control-center-1.6.1.tar.xz
+/mate-control-center-1.7.0.git922d0e0.tar.xz
diff --git a/mate-control-center.spec b/mate-control-center.spec
index de6955b..8a85058 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,17 +1,22 @@
+%global _internal_version 922d0e0
+
 Name:           mate-control-center
-Version:        1.6.1
-Release:        3%{?dist}
+Version:        1.7.0
+Release:        0.1.git%{_internal_version}1%{?dist}
+#Release:        1%{?dist}
 Summary:        MATE Desktop control-center
 License:        LGPLv2+ and GPLv2+
 URL:            http://mate-desktop.org
-Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
+
+# 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://vicodan.fedorapeople.org/%{name}-%{version}.git%{_internal_version}.tar.xz
+
+#Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
 # upstream patch
 # swithch to gnome-keyring > f19
 # http://git.mate-desktop.org/mate-control-center/commit/?id=2b05d5f
-%if 0%{?fedora} > 19
-Patch0:        mate-control-center_use-gnome-keyring_instead-of-mate-keyring.patch
-%endif
 
 BuildRequires: dconf-devel
 BuildRequires: desktop-file-utils
@@ -24,7 +29,6 @@ BuildRequires: libXScrnSaver-devel
 BuildRequires: libXxf86misc-devel
 BuildRequires: mate-common
 BuildRequires: mate-desktop-devel
-BuildRequires: mate-doc-utils
 BuildRequires: mate-menus-devel
 BuildRequires: mate-settings-daemon-devel
 BuildRequires: mate-window-manager-devel
@@ -67,13 +71,13 @@ Development files for mate-control-center
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_internal_version}
 
 %if 0%{?fedora} > 19
-%patch0 -p1 -b .gnome-keyring
 %endif
 
 %build
+NOCONFIGURE=1 ./autogen.sh
 %configure --disable-static          \
            --disable-schemas-compile \
            --disable-update-mimedb   \
@@ -141,10 +145,9 @@ fi
 %{_datadir}/glib-2.0/schemas/org.mate.*.xml
 %{_datadir}/mate-control-center/*
 %{_datadir}/mate/cursor-fonts/*.pcf
-%{_datadir}/mate/help/mate-control-center
+%{_datadir}/help/*/mate-control-center
 %{_datadir}/mime/packages/mate-theme-package.xml
 %{_datadir}/thumbnailers/mate-font-viewer.thumbnailer
-%{_datadir}/omf/mate-control-center
 %{_datadir}/polkit-1/actions/org.mate.randr.policy
 %{_mandir}/man1/mate-about-me.1.gz
 %{_mandir}/man1/mate-appearance-properties.1.gz
@@ -166,6 +169,9 @@ fi
 
 
 %changelog
+* Fri Dec 06 2013 Dan Mashal <dan.mashal at fedoraproject.org> 1.7.0-1.1.git922d0e0
+- Update to 1.7.0
+
 * Sat Oct 19 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-3
 - switch to gnome-keyring for > f19
 
diff --git a/sources b/sources
index e6ff073..ac636da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5f5b3c6070f3dafacaf68f6d896ef50  mate-control-center-1.6.1.tar.xz
+79a6a4f4850d385f6f6bb0b11e6899c6  mate-control-center-1.7.0.git922d0e0.tar.xz