Accepting request 161329 from GNOME:Factory

Update to 1.36.0

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

gi-find-deps.sh

@@ -10,7 +10,7 @@ function split_name_version {
 base=$1
 tsymbol=${base%-*}
 # Sometimes we get a Requires on Gdk.Settings.foo, bebause you can directly use imports.gi.Gdk.Settings.Foo in Javascript.
-# We know that the symbol in this case is call Gdk, so we cut everything after the . away.
+# We know that the symbol in this case is called Gdk, so we cut everything after the . away.
 symbol=$(echo $tsymbol | awk -F. '{print $1}')
 version=${base#*-}
 # In case there is no '-' in the filename, then the split above 'fails' and version == symbol (thus: no version specified)
@@ -40,10 +40,11 @@ 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.*::' -e 's:.*"from gi.repository import Foo".*::' | 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"
+		# Temporarly disabled... this is not true if the python code is written for python3... And there seems no real 'way' to identify this.
+		# 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
 		split_name_version $module
@@ -120,6 +121,15 @@ while read file; do
 done
 }
 
+function inList() {
+  for word in $1; do
+    [[ "$word" = "$2" ]] && return 0
+  done
+  return 1
+}
+
+x64bitarch="x86_64 ppc64 s390x ia64 aarch64"
+
 for path in \
 	$(for tlpath in \
 	$(find ${RPM_BUILD_ROOT}/usr/lib64 ${RPM_BUILD_ROOT}/usr/lib /usr/lib64 /usr/lib -name '*.typelib' 2>/dev/null); do
@@ -127,7 +137,7 @@ for path in \
 	export GI_TYPELIB_PATH=$GI_TYPELIB_PATH:$path
 done
 
-if [ "${HOSTTYPE}" == "x86_64" -o "${HOSTTYPE}" == "ppc64" -o "${HOSTTYPE}" == "s390x" -o "${HOSTTYPE}" == "ia64" ]; then
+if inList "$x64bitarch" "${HOSTTYPE}"; then
 	shlib_64="()(64bit)"
 fi
 case $1 in

gobject-introspection-1.34.2.tar.xz

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

gobject-introspection-1.36.0.tar.xz

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

gobject-introspection.changes

@@ -1,3 +1,70 @@
+-------------------------------------------------------------------
+Tue Mar 26 08:41:24 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 1.36.0:
+  + Update glib annotations.
+
+-------------------------------------------------------------------
+Thu Mar 21 18:06:19 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 1.35.9:
+  + Bugs fixed: bgo#637832, bgo#662241, bgo#692165, bgo#693539,
+    bgo#694198, bgo#694426, bgo#694485, bgo#694593, bgo#695182.
+
+-------------------------------------------------------------------
+Mon Mar 11 15:49:26 UTC 2013 - dimstar@opensuse.org
+
+- Simplify gi-find-deps.sh to make it easier to add other 64bit
+  architectures. Include aarch64 in the list.
+
+-------------------------------------------------------------------
+Tue Feb 19 16:27:28 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 1.35.8:
+  + Bugs fixed: bgo#660698, bgo#687522, bgo#691873, bgo#692084,
+    bgo#693040, bgo#693096, bgo#693097, bgo#693098, bgo#693598,
+    bgo#693742, bgo#693838, bgo#693876, bgo#693939.
+
+-------------------------------------------------------------------
+Thu Jan 24 15:48:57 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 1.35.4:
+  + Update glib annotations.
+  + Various mallardwriter improvements and fixes
+  + Bugs fixed: bgo#690514, bgo#686388, bgo#656312, bgo#691030,
+    bgo#690850, bgo#690851, bgo#691524, bgo#678401, bgo#684059,
+    bgo#682355.
+
+-------------------------------------------------------------------
+Wed Jan 23 20:59:39 UTC 2013 - dimstar@opensuse.org
+
+- Eliminate lines which contain "from gi.repository import Foo"
+  (incl. quotes) as possible matches... this phrase is commonly
+  used in multiline documentation blobs (like for example in
+  python-gobject >= 3.7.3).
+
+-------------------------------------------------------------------
+Wed Jan 23 18:36:27 UTC 2013 - dimstar@opensuse.org
+
+- Modify gi-find-deps.sh: in case of python scripts, do not add
+  python-gobject Requires: we do not know if the scripts is meant
+  for python3, which would require python3-gobject.
+
+-------------------------------------------------------------------
+Tue Jan 22 18:45:15 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 1.35.3:
+  + scanner: Deprecate using identifier prefixes in GINames.
+  + giscanner: Don't prefer identifier prefixes over namespaces in
+    deps.
+  + Build system enhancements / fixes.
+  + Update glib annotations.
+  + Updated documentations.
+- Remove remnants of BUILD_FOR_VCS in the spec file.
+- Unconditionall BuildRequire gtk-doc and pass --enable-gtk-doc
+  to configure. The build system changed and the doc is no longer
+  built otherwise.
+
 -------------------------------------------------------------------
 Tue Jan 22 13:11:47 UTC 2013 - dimstar@opensuse.org
 

gobject-introspection.spec

@@ -17,14 +17,15 @@
 
 
 Name:           gobject-introspection
-Version:        1.34.2
+Version:        1.36.0
 Release:        0
+# FIXME: Find a way to identify if we need python3-gobject or python-gobject from gi-find-deps.sh.
 # 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
 License:        LGPL-2.1+ and GPL-2.0+
 Group:          Development/Libraries/GNOME
 Url:            http://live.gnome.org/GObjectIntrospection
-Source0:        http://download.gnome.org/sources/gobject-introspection/1.34/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/gobject-introspection/1.36/%{name}-%{version}.tar.xz
 # gi-find-deps.sh is a rpm helper for Provides and Requires. Script creates typelib()-style Provides/Requires.
 Source1:        gi-find-deps.sh
 Source2:        gobjectintrospection.attr
@@ -35,6 +36,7 @@ Patch0:         g-ir-dep-tool.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
+BuildRequires:  gtk-doc
 BuildRequires:  libffi-devel
 # needed for patch0
 BuildRequires:  libtool
@@ -42,12 +44,8 @@ BuildRequires:  python-devel
 BuildRequires:  python-xml
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
-BuildRequires:  pkgconfig(glib-2.0) >= 2.34.1
+BuildRequires:  pkgconfig(glib-2.0) >= 2.36.0
 BuildRequires:  pkgconfig(gobject-2.0)
-%if 0%{?BUILD_FROM_VCS}
-BuildRequires:  gnome-common
-BuildRequires:  gtk-doc
-%endif
 # gi-find-deps makes use of 'file' to identify the types.
 Requires:       file
 Requires:       libgirepository-1_0-1 = %{version}
@@ -97,17 +95,11 @@ a uniform, machine readable format.
 %setup -q
 %patch0 -p1
 
-%if 0%{?BUILD_FROM_VCS}
-[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
-%endif
-
 %build
 # needed for patch0
 autoreconf -fi
 %configure \
-%if 0%{?BUILD_FROM_VCS}
         --enable-gtk-doc \
-%endif
         --disable-static
 %__make %{?_smp_mflags} V=1