From 8d03ebf4e321a6a24a022285704b950039f3327418bcd985a87916e625b8784f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 23 Jan 2013 16:34:14 +0000 Subject: [PATCH] Accepting request 149595 from home:dimstar:branches:GNOME:Factory - Fix gi-find-deps.sh: escape "." in grep calls ("\."). OBS-URL: https://build.opensuse.org/request/show/149595 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=114 --- gi-find-deps.sh | 8 ++++---- gobject-introspection.changes | 5 +++++ gobject-introspection.spec | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gi-find-deps.sh b/gi-find-deps.sh index 6c32552..edc0a4a 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -40,23 +40,23 @@ done } function python_requires { - for module in $(grep -h -P "from gi.repository import (\w+)" $1 | sed -e 's:#.*::' -e 's:raise ImportError.*::' | 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 "from gi\.repository import (\w+)" $1 | sed -e 's:#.*::' -e 's:raise ImportError.*::' | 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 echo "python-gobject >= 2.21.4" done - for module in $(grep -h -P -o "(gi.require_version\(['\"][^'\"]+['\"],\s*['\"][^'\"]+['\"]\))" $1 | sed -e 's:gi.require_version::' -e "s:[()\"' ]::g" -e 's:,:-:'); do + for module in $(grep -h -P -o "(gi\.require_version\(['\"][^'\"]+['\"],\s*['\"][^'\"]+['\"]\))" $1 | sed -e 's:gi.require_version::' -e "s:[()\"' ]::g" -e 's:,:-:'); do split_name_version $module print_req_prov done } function javascript_requires { - for module in $(grep -h -P -o "imports.gi.([^\s'\";]+)" $1 | grep -v "imports.gi.version" | sed -r -e 's,\s+$,,g' -e 's,imports.gi.,,'); do + for module in $(grep -h -P -o "imports\.gi\.([^\s'\";]+)" $1 | grep -v "imports\.gi\.version" | sed -r -e 's,\s+$,,g' -e 's,imports.gi.,,'); do split_name_version $module print_req_prov done - for module in $(grep -h -P -o "imports.gi.versions.([^\s'\";]+)\s*=\s*['\"].+['\"]" $1 | \ + for module in $(grep -h -P -o "imports\.gi\.versions.([^\s'\";]+)\s*=\s*['\"].+['\"]" $1 | \ sed -e 's:imports.gi.versions.::' -e "s:['\"]::g" -e 's:=:-:' -e 's: ::g'); do split_name_version $module print_req_prov diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 27d146a..edda6d1 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 22 13:11:47 UTC 2013 - dimstar@opensuse.org + +- Fix gi-find-deps.sh: escape "." in grep calls ("\."). + ------------------------------------------------------------------- Mon Dec 10 22:39:56 UTC 2012 - dimstar@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index ad8543d..6a657de 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -1,7 +1,7 @@ # # spec file for package gobject-introspection # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed