Accepting request 138643 from GNOME:Factory

update to 1.34.1.1 (forwarded request 138640 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/138643
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gobject-introspection?expand=0&rev=46

gi-find-deps.sh

@@ -40,21 +40,19 @@ done
 }
 
 function find_requires {
-# FIXME: There are multiple ways gi bindings can be imported. We only catch the 'basic' one
 # Currently, we detect:
 # - in python:
 #   . from gi.repository import foo [Unversioned requirement of 'foo']
 #   . from gi.repository import foo-1.0 [versioned requirement]
+#   . gi.require_version('Gtk', '3.0') (To specify a version.. there is still an import needed)
 #   . And we do not stumble over:
 #     from gi.repository import foo as _bar
 #     from gi.repository import foo, bar
 # - in JS:
 #   . imports.gi.foo; [unversioned requirement of 'foo']
 #   . imports.gi.goo-1.0; [versioned requirement]
+#   . imports.gi.versions.Gtk = '3.0';
 #   . The imports can be listed on one line, and we catch them.
-# Forms currently not detected:
-# - js: imports.gi.versions.Gtk = '3.0';
-# - py: gi.require_version('Gtk', '3.0')
 
 while read file; do
 	case $file in
@@ -69,8 +67,12 @@ while read file; do
 				print_req_prov
 			done
 			;;
-	      *.py)
-		        for module in $(grep -h -P "from gi.repository import (\w+)" $file | 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
+	    *.py)
+		    for module in $(grep -h -P "from gi.repository import (\w+)" $file | 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
+  			done
+			for module in $(grep -h -P -o "(gi.require_version\(['\"][^'\"]+['\"],\s*['\"][^'\"]+['\"]\))" $file | sed -e 's:gi.require_version::' -e "s:[()\"' ]::g" -e 's:,:-:'); do
 				split_name_version $module
 				print_req_prov
 			done

gobject-introspection-1.34.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80e211ea95404fc7c5fa3b04ba69ee0b29af70847af315155ab06b8cff832c85
-size 1088520

gobject-introspection-1.34.1.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85b9ac268d34311138f3c6bf646c07975eebfae6ae67d9239e1066a42c5d525b
+size 1088672

gobject-introspection.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:49:31 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 1.34.1.1:
+  + Add test method for GDestroy with no user data
+- Changes from version 1.34.1:
+  + Update glib annotations to 2.34.1.
+- Add pkgconfig(glib-2.0) BuildRequires, so it can be versioned.
+
+-------------------------------------------------------------------
+Tue Oct 16 20:50:56 UTC 2012 - dimstar@opensuse.org
+
+- Extend gi-find-deps.sh to understand gi.require_version in python
+  code. This was the last know format not yet supported.
+
 -------------------------------------------------------------------
 Tue Oct  2 16:13:01 UTC 2012 - dimstar@opensuse.org
 

gobject-introspection.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gobject-introspection
-Version:        1.34.0
+Version:        1.34.1.1
 Release:        0
 # FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel
 Summary:        GObject Introspection Tools
@@ -42,6 +42,7 @@ BuildRequires:  python-devel
 BuildRequires:  python-xml
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.34.1
 BuildRequires:  pkgconfig(gobject-2.0)
 %if 0%{?BUILD_FROM_VCS}
 BuildRequires:  gnome-common