Fix the build error on opensuse42.1

  * glib2-devel version is 2.44 on opensuse.

Change-Id: I390ae0a0c42f4b187f7e7929ee437172f3bf834c

diff --git a/configure b/configure
index c68e378776336748b227013a1a3fe1674ef8a690..bd6afa82ce4da53ec83723cd301c5bbf18911237 100755 (executable)
--- a/configure
+++ b/configure
@@ -3688,7 +3688,7 @@ fi
 ##########################################
 # glib support probe
 
-glib_req_ver=2.48
+glib_req_ver=2.44
 glib_modules=gthread-2.0
 if test "$modules" = yes; then
     glib_modules="$glib_modules gmodule-export-2.0"

diff --git a/include/glib-compat.h b/include/glib-compat.h
index 0b0ec76299f07bb182d26f463815d6ab152f865a..ddd328d212be4be9cd56b9e91353b496f6feae50 100644 (file)
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -19,12 +19,12 @@
 /* Ask for warnings for anything that was marked deprecated in
  * the defined version, or before. It is a candidate for rewrite.
  */
-#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_44
 
 /* Ask for warnings if code tries to use function that did not
  * exist in the defined version. These risk breaking builds
  */
-#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_48
+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_44
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"

diff --git a/packaging/qemu-arm-static.spec b/packaging/qemu-arm-static.spec
index f113e71f24d5bc53f2c75cedfd48212f60350005..9ce4e724d5eb8f005d7d1bc5cba316d7b3bef9f7 100644 (file)
--- a/packaging/qemu-arm-static.spec
+++ b/packaging/qemu-arm-static.spec
@@ -43,7 +43,7 @@ BuildRequires:  glibc-devel-static
 BuildRequires:  makeinfo
 BuildRequires:  ninja
 BuildRequires:  pcre-devel-static
-BuildRequires:  python2-base >= 2.7
+BuildRequires:  python >= 2.7
 BuildRequires:  zlib-devel-static
 
 Provides:       qemu:%_bindir/qemu-arm-static