gi-find-deps.sh: improve sed magic to handle special sugar typelib requires1.198

3 files changed, 5 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index f33f07f..42ea1e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.198 - 26 May 2014, by Jani Välimaa
+- gi-find-deps.sh: improve sed magic to handle special sugar typelib requires
+
 Version 1.197 - 27 Dec 2013, by Pascal Terjan
 - Fix gem automated dependancies
 
diff --git a/configure.ac b/configure.ac
index 5d2e568..75eb3b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
 
 AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.197, pterjan@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.198, https://bugs.mageia.org/)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz)
 AC_CONFIG_SRCDIR
diff --git a/gi-find-deps.sh.in b/gi-find-deps.sh.in
index a66868d..60d8355 100755
--- a/gi-find-deps.sh.in
+++ b/gi-find-deps.sh.in
@@ -52,7 +52,7 @@ function javascript_requires {
 }
 
 function python_requires {
-        for module in $(grep -h -P "from gi\.repository import (\w+)" $1 | sed 's:#.*::' | sed -e 's,from gi.repository import,,' -r -e 's:\s+as\s+\w+::g' -e 's:\s*,\s*: :g'); do
+        for module in $(grep -h -P "from gi\.repository import (\w+)" $1 | sed 's:#.*::' | sed -e 's,.*from gi.repository import,,' -r -e 's:\s+as\s+\w+::g' -e 's:\s*,\s*: :g' -e 's:\s[0-9]+\s: :g' -e 's:[^A-Za-z0-9\.\-]: :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.