From 9e7d49a80059ff96fe66b3356e825c183401c7804b81473ab0e5377374435220 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 8 Feb 2012 12:54:04 +0000 Subject: [PATCH] Accepting request 102430 from home:oertel:branches:openSUSE:Factory - gi-find-deps.sh: - ia64 also needs ()(64bit) - send errors from find to /dev/null (for platforms where lib64 does not exist) OBS-URL: https://build.opensuse.org/request/show/102430 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=87 --- gi-find-deps.sh | 4 ++-- gobject-introspection.changes | 8 ++++++++ gobject-introspection.spec | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gi-find-deps.sh b/gi-find-deps.sh index 6f70228..506c03d 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -94,12 +94,12 @@ 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 + $(find ${RPM_BUILD_ROOT}/usr/lib64 ${RPM_BUILD_ROOT}/usr/lib /usr/lib64 /usr/lib -name '*.typelib' 2>/dev/null); do dirname $tlpath; done | uniq ); do export GI_TYPELIB_PATH=$GI_TYPELIB_PATH:$path done -if [ "${HOSTTYPE}" == "x86_64" -o "${HOSTTYPE}" == "ppc64" -o "${HOSTTYPE}" == "s390x" ]; then +if [ "${HOSTTYPE}" == "x86_64" -o "${HOSTTYPE}" == "ppc64" -o "${HOSTTYPE}" == "s390x" -o "${HOSTTYPE}" == "ia64" ]; then shlib_64="()(64bit)" fi case $1 in diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 1a52326..ba92cd8 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 2 01:54:31 CET 2012 - ro@suse.de + +- gi-find-deps.sh: + - ia64 also needs ()(64bit) + - send errors from find to /dev/null (for platforms where lib64 + does not exist) + ------------------------------------------------------------------- Thu Jan 19 22:31:14 UTC 2012 - vuntz@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 7159d66..2153bcb 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gobject-introspection Version: 1.31.10 Release: 0