Merge branch 'master' of git://git.pld-linux.org/packages/gobject-introspection

diff --combined gobject-introspection.spec
index 498a6d86945bd104cb38085b0d233554aa5a7590,bf961755ee623ac064a64b3c1666197b9234d0f1..1fb4683712f38e779519cab90f1c28113678ea43
--- 1/gobject-introspection.spec
--- 2/gobject-introspection.spec
+++ b/gobject-introspection.spec
@@@ -10,7 -10,7 +10,7 @@@ Summary:      Introspection for GObject libr
  Summary(pl.UTF-8):    Obserwacja bibliotek GObject
  Name:         gobject-introspection
  Version:      1.36.0
- Release:      1
+ Release:      2
  License:      LGPL v2+ (giscanner) and GPL v2+ (tools)
  Group:                Libraries
  Source0:      http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.36/%{name}-%{version}.tar.xz
@@@ -29,6 -29,7 +29,7 @@@ BuildRequires:        libffi-deve
  BuildRequires:        libtool >= 2:2.2
  BuildRequires:        pkgconfig
  BuildRequires:        python >= 1:2.5
+ BuildRequires:        python-Mako
  BuildRequires:        python-devel >= 1:2.5
  BuildRequires:        python-modules
  BuildRequires:        rpm-pythonprov
@@@ -52,11 -53,10 +53,12 @@@ Group:             Development/Librarie
  Requires:     %{name} = %{version}-%{release}
  Requires:     glib2-devel >= 1:2.36.0
  Requires:     libffi-devel
+ Requires:     python-Mako
  Requires:     python-modules
  # for ldd
  Requires:     glibc-misc
 +# vala 0.18 seems to fail on recently generated .gir files
 +Conflicts:    vala < 2:0.20
  
  %description devel
  Header files for gobject-introspection library.