From 1142a86b7ce82fc5af376a5a6128d291e3dafd48 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 7 Jun 2012 10:01:35 +0100 Subject: [PATCH] Update to 1.33.2 --- .gitignore | 1 + gi-pkgconfig-requires-private.patch | 34 ----------------------------- gobject-introspection.spec | 11 +++++----- sources | 2 +- 4 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 gi-pkgconfig-requires-private.patch diff --git a/.gitignore b/.gitignore index bf289db..2801f7c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /gobject-introspection-1.31.22.tar.xz /gobject-introspection-1.32.0.tar.xz /gobject-introspection-1.32.1.tar.xz +/gobject-introspection-1.33.2.tar.xz diff --git a/gi-pkgconfig-requires-private.patch b/gi-pkgconfig-requires-private.patch deleted file mode 100644 index cc0ba93..0000000 --- a/gi-pkgconfig-requires-private.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/gobject-introspection-1.0.pc.in b/gobject-introspection-1.0.pc.in -index 32e7877..9613fec 100644 ---- a/gobject-introspection-1.0.pc.in -+++ b/gobject-introspection-1.0.pc.in -@@ -14,8 +14,10 @@ girdir=${datadir}/gir-1.0 - typelibdir=${libdir}/girepository-1.0 - - Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@ --Requires: glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 @FFI_PC_PACKAGES@ --Libs: -L${libdir} -lgirepository-1.0 @FFI_PC_LIBS@ -+Requires: glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0 -+Requires.private: @FFI_PC_PACKAGES@ -+Libs: -L${libdir} -lgirepository-1.0 -+Libs.private: @FFI_PC_LIBS@ - - Name: gobject-introspection - Description: GObject Introspection -diff --git a/gobject-introspection-no-export-1.0.pc.in b/gobject-introspection-no-export-1.0.pc.in -index 110cb75..a6d6cc6 100644 ---- a/gobject-introspection-no-export-1.0.pc.in -+++ b/gobject-introspection-no-export-1.0.pc.in -@@ -13,8 +13,10 @@ girdir=${datadir}/gir-1.0 - typelibdir=${libdir}/girepository-1.0 - - Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@ --Requires: glib-2.0 gobject-2.0 gmodule-no-export-2.0 gthread-2.0 @FFI_PC_PACKAGES@ --Libs: -L${libdir} -lgirepository-1.0 @FFI_PC_LIBS@ -+Requires: glib-2.0 gobject-2.0 gmodule-no-export-2.0 gthread-2.0 -+Requires.private: @FFI_PC_PACKAGES@ -+Libs: -L${libdir} -lgirepository-1.0 -+Libs.private: @FFI_PC_LIBS@ - - Name: gobject-introspection - Description: GObject Introspection diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 296fe40..e02b432 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.32.1 -Release: 2%{?dist} +Version: 1.33.2 +Release: 1%{?dist} Summary: Introspection system for GObject-based libraries Group: Development/Libraries @@ -11,9 +11,6 @@ License: GPLv2+, LGPLv2+, MIT 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 -# Move libffi to pkgconfig Requires.private, in order to -# reduce the impact when libffi soname bump lands in rawhide. -Patch0: gi-pkgconfig-requires-private.patch Obsoletes: gir-repository @@ -57,7 +54,6 @@ Libraries and headers for gobject-introspection %prep %setup -q -%patch0 -p1 -b .pc_requires_private %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 +* Thu Jun 07 2012 Richard Hughes - 1.33.2-1 +- Update to 1.33.2 + * Fri Apr 27 2012 Kalev Lember - 1.32.1-2 - Move libffi to pkgconfig Requires.private, in order to reduce the impact when libffi soname bump lands in rawhide. diff --git a/sources b/sources index 360da87..60ed65e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7bbdb696c37bb98aef5af02c4b8975e3 gobject-introspection-1.32.1.tar.xz +6f2065d6f4a178ca80b49ba0779a0632 gobject-introspection-1.33.2.tar.xz