From 068d29e78bd4be8b5cff621997ce5e6d088c76b1241f9c9ab91cc54a5224d985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 11 Feb 2017 17:00:40 +0000 Subject: [PATCH] Accepting request 456406 from home:dimstar:branches:GNOME:Factory - gi-find-deps.sh: do not match "from gi.repository import" if there is anything but white space in front of it (usually indicates we are in some descriptive comment block)" OBS-URL: https://build.opensuse.org/request/show/456406 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=162 --- gi-find-deps.sh | 2 +- gobject-introspection.changes | 7 +++++++ gobject-introspection.spec | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gi-find-deps.sh b/gi-find-deps.sh index 0566a4e..a40c719 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -60,7 +60,7 @@ rm -rf "$tmpdir" } function python_requires { - for module in $(grep -h -P "from gi\.repository import (\w+)" $1 | sed -e 's:#.*::' -e 's:raise ImportError.*::' -e 's:.*"from gi.repository import .*".*::' | sed -e 's,from gi.repository import,,' -r -e 's:\s+$::g' -e 's:\s+as\s+\w+::g' -e 's:,: :g'); do + for module in $(grep -h -P "^\s*from gi\.repository import (\w+)" $1 | sed -e 's:#.*::' -e 's:raise ImportError.*::' -e 's:.*"from gi.repository import .*".*::' | sed -e 's,from gi.repository import,,' -r -e 's:\s+$::g' -e 's:\s+as\s+\w+::g' -e 's:,: :g'); do split_name_version $module print_req_prov # Temporarly disabled... this is not true if the python code is written for python3... And there seems no real 'way' to identify this. diff --git a/gobject-introspection.changes b/gobject-introspection.changes index b4a7792..d4f2958 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 11 16:24:53 UTC 2017 - dimstar@opensuse.org + +- gi-find-deps.sh: do not match "from gi.repository import" if + there is anything but white space in front of it (usually + indicates we are in some descriptive comment block)" + ------------------------------------------------------------------- Wed Sep 21 17:19:41 UTC 2016 - dimstar@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 8685c2b..1399535 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -1,7 +1,7 @@ # # spec file for package gobject-introspection # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -81,9 +81,9 @@ a uniform, machine readable format. %package devel Summary: GObject Introspection Development Files +# Note: the devel package requires the binaries, not just the library License: LGPL-2.1+ Group: Development/Libraries/GNOME -# Note: the devel package requires the binaries, not just the library Requires: %{name} = %{version} Requires: libffi-devel