diff --git a/.gitignore b/.gitignore index 5ea1176..94f163f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /gobject-introspection-1.33.2.tar.xz /gobject-introspection-1.33.3.tar.xz /gobject-introspection-1.33.4.tar.xz +/gobject-introspection-1.33.9.tar.xz diff --git a/gobject-introspection.spec b/gobject-introspection.spec index d20c6cd..f426de9 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -2,8 +2,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: gobject-introspection -Version: 1.33.4 -Release: 2%{?dist} +Version: 1.33.9 +Release: 1%{?dist} Summary: Introspection system for GObject-based libraries Group: Development/Libraries @@ -12,9 +12,6 @@ URL: http://live.gnome.org/GObjectIntrospection #VCS: git:git://git.gnome.org/gobject-introspection Source0: http://download.gnome.org/sources/gobject-introspection/1.32/%{name}-%{version}.tar.xz -# upstream fix -Patch0: keyfile-load.patch - Obsoletes: gir-repository BuildRequires: glib2-devel @@ -57,7 +54,6 @@ Libraries and headers for gobject-introspection %prep %setup -q -%patch0 -p1 %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; @@ -98,6 +94,9 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' %{_datadir}/gtk-doc/html/gi/* %changelog +* Tue Aug 21 2012 Richard Hughes - 1.33.9-1 +- Update to 1.33.9 + * Fri Jul 20 2012 Matthias Clasen - 1.33.4-2 - Fix an unintended api break that broke vpn in gnome-shell diff --git a/keyfile-load.patch b/keyfile-load.patch deleted file mode 100644 index 1bcd85e..0000000 --- a/keyfile-load.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gobject-introspection-1.33.4/gir/glib-2.0.c.keyfile-load gobject-introspection-1.33.4/gir/glib-2.0.c ---- gobject-introspection-1.33.4/gir/glib-2.0.c.keyfile-load 2012-07-20 14:10:18.237088099 -0400 -+++ gobject-introspection-1.33.4/gir/glib-2.0.c 2012-07-20 14:10:26.307088221 -0400 -@@ -16899,7 +16899,7 @@ - /** - * g_key_file_load_from_data: - * @key_file: an empty #GKeyFile struct -- * @data: (array length=length): key file loaded in memory -+ * @data: key file loaded in memory - * @length: the length of @data in bytes (or -1 if data is nul-terminated) - * @flags: flags from #GKeyFileFlags - * @error: return location for a #GError, or %NULL diff --git a/sources b/sources index c05e130..cb23467 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e03c9fc4219e5c7f028c696e1504009b gobject-introspection-1.33.4.tar.xz +7c91b720ec076822bd25d19c986d88ce gobject-introspection-1.33.9.tar.xz