From b8d072f0343f02c3826ce13a54591a8712d75f207c8bae6d1cc4c4c04fcbb124 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 23 Dec 2011 15:19:31 +0000 Subject: [PATCH] Accepting request 98050 from home:dimstar:branches:GNOME:Factory Fixup: also include subfolders of buildroot/usr/lib OBS-URL: https://build.opensuse.org/request/show/98050 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=81 --- gi-find-deps.sh | 7 ++++++- gobject-introspection.changes | 6 ++++++ gobject-introspection.spec | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gi-find-deps.sh b/gi-find-deps.sh index c11c94c..c87f50f 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -92,8 +92,13 @@ while read file; do done } +for path in \ + $(for tlpath in \ + $(find ${RPM_BUILD_ROOT}/usr/lib64 ${RPM_BUILD_ROOT}/usr/lib /usr/lib64 /usr/lib -name '*.typelib'); do + dirname $tlpath; done | uniq ); do + export GI_TYPELIB_PATH=$GI_TYPELIB_PATH:$path +done -export GI_TYPELIB_PATH="${RPM_BUILD_ROOT}/usr/lib/girepository-1.0:${RPM_BUILD_ROOT}/usr/lib64/girepository-1.0" if [ "${HOSTTYPE}" == "x86_64" ]; then shlib_64="()(64bit)" fi diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 7381118..02c52f4 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 23 11:19:48 UTC 2011 - dimstar@opensuse.org + +- Enhance gi-find-deps.sh: Inject subfolders of libdir containing + .typelib files into GI_TYPELIB_PATH. + ------------------------------------------------------------------- Tue Dec 20 20:32:17 UTC 2011 - vuntz@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 5aa64f7..ee2cabe 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -16,6 +16,7 @@ # + Name: gobject-introspection Version: 1.31.6 Release: 0