modify buildrequire to python3

expected-gtypes-body-f30.h

@@ -0,0 +1,100 @@
+/* Auto-generated, do not edit.
+ *
+ * This file may be distributed under the same terms
+ * as the specification from which it was generated.
+ */
+
+GType
+the_prefix_type_dbus_hash_sv (void)
+{
+  static GType t = 0;
+
+  if (G_UNLIKELY (t == 0))
+    t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
+  return t;
+}
+
+GType
+the_prefix_type_dbus_hash_ss (void)
+{
+  static GType t = 0;
+
+  if (G_UNLIKELY (t == 0))
+    t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING);
+  return t;
+}
+
+GType
+the_prefix_type_dbus_hash_sa_7bsv_7d (void)
+{
+  static GType t = 0;
+
+  if (G_UNLIKELY (t == 0))
+    t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)));
+  return t;
+}
+
+GType
+the_prefix_type_dbus_hash_saa_7bsv_7d (void)
+{
+  static GType t = 0;
+
+  if (G_UNLIKELY (t == 0))
+    t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)))));
+  return t;
+}
+
+GType
+the_prefix_type_dbus_struct_isu (void)
+{
+  static GType t = 0;
+
+  if (G_UNLIKELY (t == 0))
+    t = dbus_g_type_get_struct ("GValueArray",
+        G_TYPE_INT,
+        G_TYPE_STRING,
+        G_TYPE_UINT,
+        G_TYPE_INVALID);
+  return t;
+}
+
+GType
+the_prefix_type_dbus_array_isu (void)
+{
+  static GType t = 0;
+
+  if (G_UNLIKELY (t == 0))
+    t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_struct_isu ());
+  return t;
+}
+
+GType
+the_prefix_type_dbus_array_of_a_7bsv_7d (void)
+{
+  static GType t = 0;
+
+  if (G_UNLIKELY (t == 0))
+    t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sv ());
+  return t;
+}
+
+GType
+the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d (void)
+{
+  static GType t = 0;
+
+  if (G_UNLIKELY (t == 0))
+    t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sa_7bsv_7d ());
+  return t;
+}
+
+GType
+the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void)
+{
+  static GType t = 0;
+
+  if (G_UNLIKELY (t == 0))
+    t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_saa_7bsv_7d ());
+  return t;
+}
+

expected-gtypes-f30.h

@@ -0,0 +1,42 @@
+/* Auto-generated, do not edit.
+ *
+ * This file may be distributed under the same terms
+ * as the specification from which it was generated.
+ */
+
+#define THE_PREFIX_HASH_TYPE_STRING_VARIANT_MAP (the_prefix_type_dbus_hash_sv ())
+
+#define THE_PREFIX_ARRAY_TYPE_STRING_VARIANT_MAP_LIST (the_prefix_type_dbus_array_of_a_7bsv_7d ())
+
+#define THE_PREFIX_HASH_TYPE_STRING_STRING_MAP (the_prefix_type_dbus_hash_ss ())
+
+#define THE_PREFIX_HASH_TYPE_STRING_VARIANT_MAP_MAP (the_prefix_type_dbus_hash_sa_7bsv_7d ())
+
+#define THE_PREFIX_ARRAY_TYPE_STRING_VARIANT_MAP_MAP_LIST (the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d ())
+
+#define THE_PREFIX_HASH_TYPE_STRING_VARIANT_MAP_LIST_MAP (the_prefix_type_dbus_hash_saa_7bsv_7d ())
+
+#define THE_PREFIX_ARRAY_TYPE_STRING_VARIANT_MAP_LIST_MAP_LIST (the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d ())
+
+GType the_prefix_type_dbus_hash_sv (void);
+
+GType the_prefix_type_dbus_hash_ss (void);
+
+GType the_prefix_type_dbus_hash_sa_7bsv_7d (void);
+
+GType the_prefix_type_dbus_hash_saa_7bsv_7d (void);
+
+#define THE_PREFIX_STRUCT_TYPE_STRUCT (the_prefix_type_dbus_struct_isu ())
+
+#define THE_PREFIX_ARRAY_TYPE_STRUCT_LIST (the_prefix_type_dbus_array_isu ())
+
+GType the_prefix_type_dbus_struct_isu (void);
+
+GType the_prefix_type_dbus_array_isu (void);
+
+GType the_prefix_type_dbus_array_of_a_7bsv_7d (void);
+
+GType the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d (void);
+
+GType the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void);
+

telepathy-glib.spec

@@ -1,6 +1,6 @@
 Name:              telepathy-glib
 Version:           0.24.1
-Release:           11
+Release:           12
 Summary:           GObject-based library for the Telepathy D-Bus API
 
 License:           LGPLv2+
@@ -8,8 +8,11 @@ URL:               http://telepathy.freedesktop.org/
 Source0:           http://telepathy.freedesktop.org/releases/telepathy-glib/%{name}-%{version}.tar.gz
 
 Patch0:            telepathy-glib-0.24.1-glib246.patch
+Source10:          expected-gtypes-f30.h
+Source11:          expected-gtypes-body-f30.h
+
 BuildRequires:     dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel
-BuildRequires:     gtk-doc libxslt python2 vala-devel vala git python2
+BuildRequires:     gtk-doc libxslt vala-devel vala git python3
 Requires:	   glibc dbus-libs dbus-glib glib2
 
 Provides:          %{name}-vala
@@ -33,7 +36,27 @@ Header files for telepathy-glib
 %prep
 %autosetup -n %{name}-%{version} -p1
 
+# Explicitly switch to python3
+env LANG=C grep -rl python . | \
+	xargs sed -i \
+		-e 's|/usr/bin/python$|/usr/bin/python3|'  \
+		-e 's|/usr/bin/env[ \t]*python$|/usr/bin/python3|' \
+		%{nil}
+ 
+# And tweak timestamps
+touch aclocal.m4
+find . -name Makefile.in | xargs touch
+touch configure
+touch config.h.in
+ 
+ 
+sed -i tests/all-errors-documented.py -e 's|^\(.*\)print\(.*\)|\1print (\2)|'
+cp -p %SOURCE10 tests/tools/expected-gtypes.h
+cp -p %SOURCE11 tests/tools/expected-gtypes-body.h
+ 
 %build
+export PYTHON=python3
+
 %configure --enable-introspection=yes --enable-vala-bindings=yes
 %make_build
 
@@ -68,6 +91,9 @@ make check
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Oct 21 2020 jinzhimin <jinzhimin2@huawei.com> - 0.24.1-12
+- modify buildrequire to python3
+
 * Mon Oct 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.24.1-11
 - Type:enhancement
 - Id:NA