From c3d8d69b964c4b62f8cdaa1eea9c161a0e7924f8d57343742e4443b8cfec51ff Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 12 Jul 2011 07:02:34 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/gobject-introspection revision 27.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=34919a1a408edbae3e808eab84285b08 --- gobject-introspection.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gobject-introspection.spec b/gobject-introspection.spec index c1a4fca..595e5f1 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -19,7 +19,7 @@ Name: gobject-introspection Version: 1.29.0 -Release: 1 +Release: 2 # FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel License: LGPLv2.1+ Summary: GObject Introspection Tools From d954ba886d5252f6d1e836abf8907b3b66fbc76bf6c29446fd2477c14f2e69eb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 20 Jul 2011 08:09:38 +0000 Subject: [PATCH 2/2] Accepting request 76485 from home:vuntz:branches:GNOME:Factory Fix gi-find-deps to deal with \r\n OBS-URL: https://build.opensuse.org/request/show/76485 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=62 --- gi-find-deps.sh | 4 ++-- gobject-introspection.changes | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gi-find-deps.sh b/gi-find-deps.sh index eb6a11f..0939ba1 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -59,13 +59,13 @@ function find_requires { while read file; do case $file in *.js) - for module in $(grep -h -P -o "imports.gi.([^\s'\";]+)" $file | grep -v "imports.gi.version" | sed 's,imports.gi.,,'); do + for module in $(grep -h -P -o "imports.gi.([^\s'\";]+)" $file | grep -v "imports.gi.version" | sed -r -e 's,\s+$,,g' -e 's,imports.gi.,,'); do split_name_version $module print_req_prov done ;; *.py) - for module in $(grep -h -P "from gi.repository import (\w+)" $file | sed 's:#.*::' | sed -e 's,from gi.repository import,,' -r -e 's:\s+as\s+\w+::g' -e 's:,: :g'); do + for module in $(grep -h -P "from gi.repository import (\w+)" $file | sed 's:#.*::' | 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 done diff --git a/gobject-introspection.changes b/gobject-introspection.changes index bf6291c..1d7a246 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 19 17:51:07 CEST 2011 - vuntz@opensuse.org + +- gi-find-deps.sh: Remove trailing space characters from the + import lines, when listing the required typelibs. This fixes an + issue with files using \r\n to end a line (since \r was kept, and + was breaking the output of the script). + ------------------------------------------------------------------- Mon Jul 11 13:24:35 CEST 2011 - vuntz@opensuse.org