Accepting request 174180 from home:dimstar:branches:GNOME:Factory

Update to 2.37.0

OBS-URL: https://build.opensuse.org/request/show/174180
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=225

glib2.spec

@@ -20,14 +20,15 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.36.1
+Version:        2.37.0
 Release:        0
+# FIXME: Remove libtool BuildRequires and autoreconf call
 # FIXME: find out if tapsets should really be in devel package or in main package
 Summary:        General-Purpose Utility Library
 License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            http://www.gtk.org/
-Source:         http://download.gnome.org/sources/glib/2.36/%{_name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/glib/2.37/%{_name}-%{version}.tar.xz
 Source1:        glib2.sh
 Source2:        glib2.csh
 # Not upstream file. Only proposes upstream packages:
@@ -51,6 +52,8 @@ BuildRequires:  fam-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libselinux-devel
+# Needed due to some errors in the tarball
+BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  python-base
 # gdbus-codegen is run during the build, so we need python-xml
@@ -69,12 +72,6 @@ BuildRequires:  pkgconfig(libelf) >= 0.8.12
 BuildRequires:  pkgconfig(libffi)
 BuildRequires:  pkgconfig(libpcre) >= 8.13
 BuildRequires:  pkgconfig(zlib)
-%if 0%{?BUILD_FROM_VCS}
-# It's important to keep those BuildRequires inside
-# BUILD_FROM_VCS to avoid build loops in Factory
-BuildRequires:  git-core
-BuildRequires:  gtk-doc
-%endif
 # For temporary %%posttrans script only.
 PreReq:         coreutils
 PreReq:         /bin/sed
@@ -262,11 +259,10 @@ cp -a %{S:4} gnome_defaults.conf
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
     cp -a %{S:7} m4macros/
 fi
-%if 0%{?BUILD_FROM_VCS}
-NOCONFIGURE=1 ./autogen.sh
-%endif
 
 %build
+# Needed due to some errors in the tarball
+autoreconf
 %configure \
     --enable-static \
     --enable-selinux \
@@ -277,9 +273,6 @@ NOCONFIGURE=1 ./autogen.sh
     --with-pcre=system
 
 %{__make} %{?_smp_mflags} V=1
-%if 0%{?BUILD_FROM_VCS}
-%{__make} ChangeLog
-%endif
 
 %check
 # make check does not work on x86_64. See http://bugzilla.gnome.org/show_bug.cgi?id=554969