[mate-panel] Update to 1.7.0 git snapshot

[Dan Mashal]

commit 46c64391613fc27f91ef9bf64d5a122b5854a7f5
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Fri Dec 6 16:01:25 2013 -0800

    Update to 1.7.0 git snapshot

 .gitignore      |    1 +
 mate-panel.spec |   45 +++++++++++++++++++++++++--------------------
 sources         |    2 +-
 3 files changed, 27 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 142e96b..67570c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /mate-panel-1.5.6.tar.xz
 /mate-panel-1.6.0.tar.xz
 /mate-panel-1.6.1.tar.xz
+/mate-panel-1.7.0.gitd2a24b9.tar.xz
diff --git a/mate-panel.spec b/mate-panel.spec
index 1457f62..27934b8 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -1,16 +1,19 @@
+%global _internal_version d2a24b9
+
 Name:           mate-panel
-Version:        1.6.1
-Release:        4%{?dist}
-Summary:        MATE Desktop panel applets
+Version:        1.7.0
+Release:        0.1.git%{_internal_version}1%{?dist}
+Summary:        MATE Desktop panel and applets
 #libs are LGPLv2+ applications GPLv2+
 License:        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
 Source1:        panel-default-layout.dist
 
-# upstream patch
-# http://git.mate-desktop.org/mate-panel/commit/?h=issue-111
-Patch0:         mate-panel_reset_fix.patch
+#Source0:        http://pub.mate-desktop.org/releases/1.7/%{name}-%{version}.tar.gz
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 # needed as nothing else requires it
@@ -29,17 +32,17 @@ BuildRequires:  gtk2-devel
 BuildRequires:  icon-naming-utils
 BuildRequires:  libcanberra-devel
 BuildRequires:  libmateweather-devel
-BuildRequires:  libmatewnck-devel
 BuildRequires:  libnm-gtk-devel
 BuildRequires:  librsvg2-devel
+BuildRequires:  libwnck-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libX11-devel
 BuildRequires:  mate-common
 BuildRequires:  mate-desktop-devel
-BuildRequires:  mate-doc-utils
 BuildRequires:  mate-menus-devel
 BuildRequires:  pango-devel
 BuildRequires:  popt-devel
+BuildRequires:  yelp-tools
 
 %description
 MATE Desktop panel applets
@@ -61,9 +64,9 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Development files for mate-panel
 
 %prep
-%setup -q
-%patch0 -p1 -b .reset
-
+%setup -q -n %{name}-%{_internal_version}
+NOCONFIGURE=1 ./autogen.sh
+autoreconf -fi
 
 %build
 
@@ -74,6 +77,7 @@ Development files for mate-panel
            --with-x                               \
            --enable-network-manager               \
            --libexecdir=%{_libexecdir}/mate-panel \
+           --with-gtk=2.0                         \
            --enable-introspection
 make  %{?_smp_mflags} V=1
 
@@ -120,15 +124,13 @@ update-desktop-database &> /dev/null || :
 %{_bindir}/mate-panel
 %{_bindir}/mate-panel-test-applets
 %{_libdir}/girepository-1.0/MatePanelApplet-4.0.typelib
-%{_libexecdir}/mate-panel/
+%{_libexecdir}/mate-panel
 %{_datadir}/glib-2.0/schemas/org.mate.panel.*.xml
 %{_datadir}/applications/mate-panel.desktop
-%{_datadir}/omf/mate-applet-fish/
-%{_datadir}/omf/mate-applet-clock/
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mate/help/mate-applet-clock/
-%{_datadir}/mate/help/mate-applet-fish/
-%{_datadir}/mate-panel/
+%{_datadir}/help/*/clock
+%{_datadir}/help/*/fish
+%{_datadir}/mate-panel
 %{_datadir}/dbus-1/services/org.mate.panel.applet.ClockAppletFactory.service
 %{_datadir}/dbus-1/services/org.mate.panel.applet.FishAppletFactory.service
 %{_datadir}/dbus-1/services/org.mate.panel.applet.NotificationAreaAppletFactory.service
@@ -143,13 +145,16 @@ update-desktop-database &> /dev/null || :
 
 %files devel
 %{_libdir}/libmate-panel-applet-4.so
-%{_includedir}/mate-panel-4.0/
+%{_includedir}/mate-panel-4.0
 %{_libdir}/pkgconfig/libmatepanelapplet-4.0.pc
 %{_datadir}/gir-1.0/MatePanelApplet-4.0.gir
-%{_datadir}/gtk-doc/html/mate-panel-applet/
 
 
 %changelog
+* Fri Dec 06 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-1.1.gitd2a24b9
+- Update to 1.7.0
+- Use latest upstream git as released version fails to build with gtk2 
+
 * Thu Sep 12 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-4
 - add runtime require mate-file-manager-schemas, fix rhbz (#1007219)
 
diff --git a/sources b/sources
index 7af662b..80e64ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-330120e045183413bca371b295c6a1df  mate-panel-1.6.1.tar.xz
+7feb91eb0b342fb675972e6e4ba6786c  mate-panel-1.7.0.gitd2a24b9.tar.xz