[gnome-menus] sync with f16

[Matthias Clasen]

commit 7f3b85abc6b3dbdbc5c3a99727a6167ca5dc9e22
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Aug 24 16:57:35 2011 -0400

    sync with f16

 .gitignore       |    1 +
 gnome-menus.spec |   27 ++++++++++++++++-----------
 sources          |    2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9156734..5066bac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ gnome-menus-2.30.0.tar.bz2
 /gnome-menus-2.91.91.tar.bz2
 /gnome-menus-3.0.0.tar.bz2
 /gnome-menus-3.0.1.tar.bz2
+/gnome-menus-3.1.5.tar.xz
diff --git a/gnome-menus.spec b/gnome-menus.spec
index 07fc068..9080635 100644
--- a/gnome-menus.spec
+++ b/gnome-menus.spec
@@ -2,13 +2,13 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 3.0.1
-Release: 1%{?dist}
+Version: 3.1.5
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
 #VCS: git:git://git.gnome.org/gnome-menus
-Source0: http://download.gnome.org/sources/gnome-menus/3.0/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-menus/3.1/%{name}-%{version}.tar.xz
 # Keep release notes from showing up in Applications>Other
 Patch0: other-docs.patch
 Requires:  redhat-menus
@@ -19,6 +19,9 @@ BuildRequires: glib2-devel
 BuildRequires: pkgconfig
 BuildRequires: python2-devel
 BuildRequires: intltool
+BuildRequires: gobject-introspection-devel
+# FIXME: temporary hack for introspection breakage
+BuildRequires: gnome-menus-devel 
 
 %description
 gnome-menus is an implementation of the draft "Desktop
@@ -42,7 +45,7 @@ writing applications that use the GNOME menu system.
 
 %build
 %configure --disable-static \
-   --disable-introspection \
+   --enable-introspection \
 %if %{enable_debugging}
    --enable-debug=yes
 %else
@@ -74,27 +77,29 @@ rm -rf $RPM_BUILD_ROOT%{python_sitearch}/GMenuSimpleEditor/*
 rm -rf $RPM_BUILD_ROOT%{_bindir}/gnome-menu-spec-test
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-menus/
 
-%find_lang %{name}
+%find_lang gnome-menus-3.0
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
+%files -f gnome-menus-3.0.lang
 %doc AUTHORS NEWS COPYING.LIB
 %{_sysconfdir}/xdg/menus/applications-gnome.menu
-%{_libdir}/libgnome-menu.so.*
-%{python_sitearch}/gmenu.so
+%{_libdir}/lib*.so.*
 %{_datadir}/desktop-directories/*
+%{_libdir}/girepository-1.0/GMenu-3.0.typelib
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
-%{_includedir}/gnome-menus
+%{_includedir}/gnome-menus-3.0
+%{_datadir}/gir-1.0/GMenu-3.0.gir
 
 %changelog
+* Fri Aug 24 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.5-2
+- Sync with F16
+
 * Tue Apr 26 2011 Matthias Clasen <mclasen at redhat.com> - 3.0.1-1
 - Update to 3.0.1
 
diff --git a/sources b/sources
index 769c2b6..e20aa3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44d4286a4836d33f339d0106228f1088  gnome-menus-3.0.1.tar.bz2
+7343fe0b47f7bec674ffedd06bfc19cb  gnome-menus-3.1.5.tar.xz