From aebb17041f7fe6b686d9bdcd92691a0bfa674fe0361510e08236a39c3f37a098 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 22 Feb 2017 20:41:35 +0000
Subject: [PATCH 1/7] Accepting request 459869 from GNOME:Next

scripted push

OBS-URL: https://build.opensuse.org/request/show/459869
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/python-gobject?expand=0&rev=71
---
 python-gobject-missing-prototypes.patch | 31 +++++++++++++++++++++++++
 python-gobject.changes                  |  8 +++++++
 python-gobject.spec                     |  7 +++++-
 python3-gobject.changes                 |  8 +++++++
 python3-gobject.spec                    |  7 +++++-
 5 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 python-gobject-missing-prototypes.patch

diff --git a/python-gobject-missing-prototypes.patch b/python-gobject-missing-prototypes.patch
new file mode 100644
index 0000000..d92634b
--- /dev/null
+++ b/python-gobject-missing-prototypes.patch
@@ -0,0 +1,31 @@
+From d005df9645fd5fb2f19bd09384355f45591f1e58 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <creiter@src.gnome.org>
+Date: Mon, 23 Jan 2017 21:26:05 +0100
+Subject: Disable -Werror=missing-prototypes
+
+https://bugzilla.gnome.org/show_bug.cgi?id=760056
+added some code triggering "missing-prototype" which we by default
+treat as an error. This disables that specific error by default.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=777534
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c8d95c7..8e225f4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -228,7 +228,7 @@ AC_SUBST(INTROSPECTION_SCANNER)
+ AC_SUBST(INTROSPECTION_COMPILER)
+ 
+ # compiler warnings, errors, required cflags, and code coverage support
+-GNOME_COMPILE_WARNINGS([maximum])
++GNOME_COMPILE_WARNINGS([maximum], [-Wno-error=missing-prototypes])
+ AC_MSG_CHECKING(for Gnome code coverage support)
+ m4_ifdef([GNOME_CODE_COVERAGE],
+          [AC_MSG_RESULT(yes)
+-- 
+cgit v0.12
+
+
diff --git a/python-gobject.changes b/python-gobject.changes
index 8bfa7e4..cc23ca1 100644
--- a/python-gobject.changes
+++ b/python-gobject.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 22 18:06:29 UTC 2017 - dimstar@opensuse.org
+
+- Add python-gobject-missing-prototypes.patch: Disable
+  -Werror=missing-prototypes (bgo#777534).
+- Add gnome-common BuildRequires and call autoreconf, as above
+  patch touches the build system.
+
 -------------------------------------------------------------------
 Mon Sep 19 14:58:45 UTC 2016 - dimstar@opensuse.org
 
diff --git a/python-gobject.spec b/python-gobject.spec
index a850a11..2bf2b99 100644
--- a/python-gobject.spec
+++ b/python-gobject.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-gobject
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -46,8 +46,11 @@ Url:            https://wiki.gnome.org/Projects/PyGObject/
 Source:         http://download.gnome.org/sources/pygobject/3.22/%{_name}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM pycompile-searchpath.patch jmatejek@suse.com -- Fix build with python 3.4
 Patch1:         pycompile-searchpath.patch
+# PATCH-FIX-UPSTREAM python-gobject-missing-prototypes.patch bgo#777534 dimstar@opensuse.org -- Disable -Werror=missing-prototypes, taken from git commit d005df
+Patch2:         python-gobject-missing-prototypes.patch
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel >= 2.38.0
+BuildRequires:  gnome-common
 BuildRequires:  gobject-introspection-devel >= 1.46.0
 BuildRequires:  libffi-devel >= 3.0.0
 %if %{build_for_python3}
@@ -116,8 +119,10 @@ addon libraries such as pygtk.
 %prep
 %setup -q -n %{_name}-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
+autoreconf -fiv
 %if %{build_for_python3}
 export PYTHON=python3
 %else
diff --git a/python3-gobject.changes b/python3-gobject.changes
index 8bfa7e4..cc23ca1 100644
--- a/python3-gobject.changes
+++ b/python3-gobject.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 22 18:06:29 UTC 2017 - dimstar@opensuse.org
+
+- Add python-gobject-missing-prototypes.patch: Disable
+  -Werror=missing-prototypes (bgo#777534).
+- Add gnome-common BuildRequires and call autoreconf, as above
+  patch touches the build system.
+
 -------------------------------------------------------------------
 Mon Sep 19 14:58:45 UTC 2016 - dimstar@opensuse.org
 
diff --git a/python3-gobject.spec b/python3-gobject.spec
index d222932..dceb72b 100644
--- a/python3-gobject.spec
+++ b/python3-gobject.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python3-gobject
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -46,8 +46,11 @@ Url:            https://wiki.gnome.org/Projects/PyGObject/
 Source:         http://download.gnome.org/sources/pygobject/3.22/%{_name}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM pycompile-searchpath.patch jmatejek@suse.com -- Fix build with python 3.4
 Patch1:         pycompile-searchpath.patch
+# PATCH-FIX-UPSTREAM python-gobject-missing-prototypes.patch bgo#777534 dimstar@opensuse.org -- Disable -Werror=missing-prototypes, taken from git commit d005df
+Patch2:         python-gobject-missing-prototypes.patch
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel >= 2.38.0
+BuildRequires:  gnome-common
 BuildRequires:  gobject-introspection-devel >= 1.46.0
 BuildRequires:  libffi-devel >= 3.0.0
 %if %{build_for_python3}
@@ -116,8 +119,10 @@ addon libraries such as pygtk.
 %prep
 %setup -q -n %{_name}-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
+autoreconf -fiv
 %if %{build_for_python3}
 export PYTHON=python3
 %else

From 834e41c99ac554574e603801fe407659a101fb9a4d79131acd16f2189f430c93 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 28 Feb 2017 21:40:13 +0000
Subject: [PATCH 2/7] Accepting request 460955 from GNOME:Next

Scripted push of GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/460955
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/python-gobject?expand=0&rev=72
---
 python-gobject.changes  | 7 +++++++
 python-gobject.spec     | 2 ++
 python3-gobject.changes | 7 +++++++
 python3-gobject.spec    | 2 ++
 4 files changed, 18 insertions(+)

diff --git a/python-gobject.changes b/python-gobject.changes
index cc23ca1..192bd23 100644
--- a/python-gobject.changes
+++ b/python-gobject.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 27 13:28:08 UTC 2017 - dimstar@opensuse.org
+
+- Move Pango overrides to -Gdk package: the main pygobject package
+  is supposed to be installable without a dependency on X
+  (boo#1025819).
+
 -------------------------------------------------------------------
 Wed Feb 22 18:06:29 UTC 2017 - dimstar@opensuse.org
 
diff --git a/python-gobject.spec b/python-gobject.spec
index 2bf2b99..a9f2696 100644
--- a/python-gobject.spec
+++ b/python-gobject.spec
@@ -159,12 +159,14 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{local_py_sitedir}/gi/overrides/Gdk.*
 %exclude %{local_py_sitedir}/gi/overrides/Gtk.*
 %exclude %{local_py_sitedir}/gi/overrides/keysyms.*
+%exclude %{local_py_sitedir}/gi/overrides/Pango.py
 
 %files Gdk
 %defattr(-,root,root)
 %{local_py_sitedir}/gi/overrides/Gdk.*
 %{local_py_sitedir}/gi/overrides/Gtk.*
 %{local_py_sitedir}/gi/overrides/keysyms.*
+%{local_py_sitedir}/gi/overrides/Pango.py
 
 %files cairo
 %defattr(-,root,root)
diff --git a/python3-gobject.changes b/python3-gobject.changes
index cc23ca1..192bd23 100644
--- a/python3-gobject.changes
+++ b/python3-gobject.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 27 13:28:08 UTC 2017 - dimstar@opensuse.org
+
+- Move Pango overrides to -Gdk package: the main pygobject package
+  is supposed to be installable without a dependency on X
+  (boo#1025819).
+
 -------------------------------------------------------------------
 Wed Feb 22 18:06:29 UTC 2017 - dimstar@opensuse.org
 
diff --git a/python3-gobject.spec b/python3-gobject.spec
index dceb72b..2c7236e 100644
--- a/python3-gobject.spec
+++ b/python3-gobject.spec
@@ -159,12 +159,14 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{local_py_sitedir}/gi/overrides/Gdk.*
 %exclude %{local_py_sitedir}/gi/overrides/Gtk.*
 %exclude %{local_py_sitedir}/gi/overrides/keysyms.*
+%exclude %{local_py_sitedir}/gi/overrides/Pango.py
 
 %files Gdk
 %defattr(-,root,root)
 %{local_py_sitedir}/gi/overrides/Gdk.*
 %{local_py_sitedir}/gi/overrides/Gtk.*
 %{local_py_sitedir}/gi/overrides/keysyms.*
+%{local_py_sitedir}/gi/overrides/Pango.py
 
 %files cairo
 %defattr(-,root,root)

From 0f8a196ef670ca37b63960a302a49ef141a22ea0fa28c90d99c6883c7aae301d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 15 Mar 2017 19:53:02 +0000
Subject: [PATCH 3/7] Accepting request 479793 from
 home:TheBlackCat:branches:GNOME:Factory

Add python2- provides for the subpackages.  This package is currently blocking a large number of packages from being ported to the new single-spec python macros (including jupyter/ipython and most scientific python packages).

This is a compromise stop-gap measure to let the porting continue while GNOME package maintainers prepare for GNOME 3.24.  A more comprehensive port to the new macros is complete and will come to GNOME:Factory after GNOME 3.24 is in openSUSE:Factory.

OBS-URL: https://build.opensuse.org/request/show/479793
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/python-gobject?expand=0&rev=73
---
 python-gobject.changes | 7 +++++++
 python-gobject.spec    | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/python-gobject.changes b/python-gobject.changes
index 192bd23..b58152b 100644
--- a/python-gobject.changes
+++ b/python-gobject.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 15 19:38:20 UTC 2017 - toddrme2178@gmail.com
+
+- Provide python2- versions of packages to ease transition to 
+  new python single-spec macros.  More comprehensive changes will
+  come after GNOME 3.24.
+
 -------------------------------------------------------------------
 Mon Feb 27 13:28:08 UTC 2017 - dimstar@opensuse.org
 
diff --git a/python-gobject.spec b/python-gobject.spec
index a9f2696..38629fe 100644
--- a/python-gobject.spec
+++ b/python-gobject.spec
@@ -64,6 +64,7 @@ BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
 # Trigger an automatic installation of python(3)?-gobject when python and libgirepository are installed.
 Supplements:    packageand(%{local_py_pkg}:libgirepository-1_0-1)
+Provides:       python2-gobject = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{local_py_requires}
 
@@ -76,6 +77,7 @@ Summary:        Python bindings for GObject -- Gdk bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 Requires:       %{name}-cairo = %{version}
+Provides:       python2-gobject-Gdk = %{version}
 %define gdk_real_package %(rpm -q --qf '%%{NAME}' -f $(readlink /usr/lib64/libgdk-3.so -f))
 Supplements:    packageand(%{name}:%{gdk_real_package})
 
@@ -89,6 +91,7 @@ This package contains the Python Gdk bindings for GObject.
 Summary:        Python bindings for GObject -- Cairo bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
+Provides:       python2-gobject-cairo = %{version}
 %define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo)
 Supplements:    packageand(%{name}:%{cairo_real_package})
 
@@ -110,6 +113,7 @@ Requires:       python3-gobject = %{version}
 # and remove the obsolete package, we obsolete/provide it here.
 Obsoletes:      python3-gobject-devel < 3.11.5
 Provides:       python3-gobject-devel = %{version}
+Provides:       python2-gobject-devel = %{version}
 
 %description devel
 This package contains files required to build wrappers for gobject

From d86d03ccf8941885040bb636834f9ad1296d449e076c43ec13de8df3b2137a86 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 15 Mar 2017 19:56:58 +0000
Subject: [PATCH 4/7] - Provide python2- versions of packages to ease
 transition to   python single-spec macros.

- Provide python2- versions of packages to ease transition to
  python single-spec macros.

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/python-gobject?expand=0&rev=74
---
 python-gobject.changes  |  5 ++---
 python-gobject.spec     |  8 +++++++-
 python3-gobject.changes |  6 ++++++
 python3-gobject.spec    | 10 ++++++++++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/python-gobject.changes b/python-gobject.changes
index b58152b..26ff0dc 100644
--- a/python-gobject.changes
+++ b/python-gobject.changes
@@ -1,9 +1,8 @@
 -------------------------------------------------------------------
 Wed Mar 15 19:38:20 UTC 2017 - toddrme2178@gmail.com
 
-- Provide python2- versions of packages to ease transition to 
-  new python single-spec macros.  More comprehensive changes will
-  come after GNOME 3.24.
+- Provide python2- versions of packages to ease transition to
+  python single-spec macros.
 
 -------------------------------------------------------------------
 Mon Feb 27 13:28:08 UTC 2017 - dimstar@opensuse.org
diff --git a/python-gobject.spec b/python-gobject.spec
index 38629fe..7efa459 100644
--- a/python-gobject.spec
+++ b/python-gobject.spec
@@ -64,7 +64,9 @@ BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
 # Trigger an automatic installation of python(3)?-gobject when python and libgirepository are installed.
 Supplements:    packageand(%{local_py_pkg}:libgirepository-1_0-1)
+%if local_py_suffix = 2
 Provides:       python2-gobject = %{version}
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{local_py_requires}
 
@@ -77,7 +79,9 @@ Summary:        Python bindings for GObject -- Gdk bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 Requires:       %{name}-cairo = %{version}
+%if local_py_suffix = 2
 Provides:       python2-gobject-Gdk = %{version}
+%endif
 %define gdk_real_package %(rpm -q --qf '%%{NAME}' -f $(readlink /usr/lib64/libgdk-3.so -f))
 Supplements:    packageand(%{name}:%{gdk_real_package})
 
@@ -91,7 +95,9 @@ This package contains the Python Gdk bindings for GObject.
 Summary:        Python bindings for GObject -- Cairo bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
+%if local_py_suffix = 2
 Provides:       python2-gobject-cairo = %{version}
+%endif
 %define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo)
 Supplements:    packageand(%{name}:%{cairo_real_package})
 
@@ -112,8 +118,8 @@ Requires:       python3-gobject = %{version}
 # python3-gobject-devel package is no longer being built. In order to ease upgrades
 # and remove the obsolete package, we obsolete/provide it here.
 Obsoletes:      python3-gobject-devel < 3.11.5
-Provides:       python3-gobject-devel = %{version}
 Provides:       python2-gobject-devel = %{version}
+Provides:       python3-gobject-devel = %{version}
 
 %description devel
 This package contains files required to build wrappers for gobject
diff --git a/python3-gobject.changes b/python3-gobject.changes
index 192bd23..26ff0dc 100644
--- a/python3-gobject.changes
+++ b/python3-gobject.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 15 19:38:20 UTC 2017 - toddrme2178@gmail.com
+
+- Provide python2- versions of packages to ease transition to
+  python single-spec macros.
+
 -------------------------------------------------------------------
 Mon Feb 27 13:28:08 UTC 2017 - dimstar@opensuse.org
 
diff --git a/python3-gobject.spec b/python3-gobject.spec
index 2c7236e..a374132 100644
--- a/python3-gobject.spec
+++ b/python3-gobject.spec
@@ -64,6 +64,9 @@ BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
 # Trigger an automatic installation of python(3)?-gobject when python and libgirepository are installed.
 Supplements:    packageand(%{local_py_pkg}:libgirepository-1_0-1)
+%if local_py_suffix = 2
+Provides:       python2-gobject = %{version}
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{local_py_requires}
 
@@ -76,6 +79,9 @@ Summary:        Python bindings for GObject -- Gdk bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 Requires:       %{name}-cairo = %{version}
+%if local_py_suffix = 2
+Provides:       python2-gobject-Gdk = %{version}
+%endif
 %define gdk_real_package %(rpm -q --qf '%%{NAME}' -f $(readlink /usr/lib64/libgdk-3.so -f))
 Supplements:    packageand(%{name}:%{gdk_real_package})
 
@@ -89,6 +95,9 @@ This package contains the Python Gdk bindings for GObject.
 Summary:        Python bindings for GObject -- Cairo bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
+%if local_py_suffix = 2
+Provides:       python2-gobject-cairo = %{version}
+%endif
 %define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo)
 Supplements:    packageand(%{name}:%{cairo_real_package})
 
@@ -109,6 +118,7 @@ Requires:       python3-gobject = %{version}
 # python3-gobject-devel package is no longer being built. In order to ease upgrades
 # and remove the obsolete package, we obsolete/provide it here.
 Obsoletes:      python3-gobject-devel < 3.11.5
+Provides:       python2-gobject-devel = %{version}
 Provides:       python3-gobject-devel = %{version}
 
 %description devel

From 45bb014513f9f68eaa3df5b377a7dc13af29f1d64b5f507590430a513ea3ecc0 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 15 Mar 2017 22:32:47 +0000
Subject: [PATCH 5/7] OBS-URL:
 https://build.opensuse.org/package/show/GNOME:Factory/python-gobject?expand=0&rev=75

---
 python-gobject.spec  | 6 +++---
 python3-gobject.spec | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/python-gobject.spec b/python-gobject.spec
index 7efa459..2eae118 100644
--- a/python-gobject.spec
+++ b/python-gobject.spec
@@ -64,7 +64,7 @@ BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
 # Trigger an automatic installation of python(3)?-gobject when python and libgirepository are installed.
 Supplements:    packageand(%{local_py_pkg}:libgirepository-1_0-1)
-%if local_py_suffix = 2
+%if local_py_suffix == 2
 Provides:       python2-gobject = %{version}
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -79,7 +79,7 @@ Summary:        Python bindings for GObject -- Gdk bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 Requires:       %{name}-cairo = %{version}
-%if local_py_suffix = 2
+%if local_py_suffix == 2
 Provides:       python2-gobject-Gdk = %{version}
 %endif
 %define gdk_real_package %(rpm -q --qf '%%{NAME}' -f $(readlink /usr/lib64/libgdk-3.so -f))
@@ -95,7 +95,7 @@ This package contains the Python Gdk bindings for GObject.
 Summary:        Python bindings for GObject -- Cairo bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
-%if local_py_suffix = 2
+%if local_py_suffix == 2
 Provides:       python2-gobject-cairo = %{version}
 %endif
 %define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo)
diff --git a/python3-gobject.spec b/python3-gobject.spec
index a374132..b7bf059 100644
--- a/python3-gobject.spec
+++ b/python3-gobject.spec
@@ -64,7 +64,7 @@ BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
 # Trigger an automatic installation of python(3)?-gobject when python and libgirepository are installed.
 Supplements:    packageand(%{local_py_pkg}:libgirepository-1_0-1)
-%if local_py_suffix = 2
+%if local_py_suffix == 2
 Provides:       python2-gobject = %{version}
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -79,7 +79,7 @@ Summary:        Python bindings for GObject -- Gdk bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 Requires:       %{name}-cairo = %{version}
-%if local_py_suffix = 2
+%if local_py_suffix == 2
 Provides:       python2-gobject-Gdk = %{version}
 %endif
 %define gdk_real_package %(rpm -q --qf '%%{NAME}' -f $(readlink /usr/lib64/libgdk-3.so -f))
@@ -95,7 +95,7 @@ This package contains the Python Gdk bindings for GObject.
 Summary:        Python bindings for GObject -- Cairo bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
-%if local_py_suffix = 2
+%if local_py_suffix == 2
 Provides:       python2-gobject-cairo = %{version}
 %endif
 %define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo)

From f13e665ed1bf2b5533d082ea68309912e25603d9913a55149185e7110f016024 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 15 Mar 2017 22:43:53 +0000
Subject: [PATCH 6/7] OBS-URL:
 https://build.opensuse.org/package/show/GNOME:Factory/python-gobject?expand=0&rev=76

---
 python-gobject.spec  | 6 +++---
 python3-gobject.spec | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/python-gobject.spec b/python-gobject.spec
index 2eae118..1329168 100644
--- a/python-gobject.spec
+++ b/python-gobject.spec
@@ -64,7 +64,7 @@ BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
 # Trigger an automatic installation of python(3)?-gobject when python and libgirepository are installed.
 Supplements:    packageand(%{local_py_pkg}:libgirepository-1_0-1)
-%if local_py_suffix == 2
+%if %local_py_suffix == 2
 Provides:       python2-gobject = %{version}
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -79,7 +79,7 @@ Summary:        Python bindings for GObject -- Gdk bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 Requires:       %{name}-cairo = %{version}
-%if local_py_suffix == 2
+%if %local_py_suffix == 2
 Provides:       python2-gobject-Gdk = %{version}
 %endif
 %define gdk_real_package %(rpm -q --qf '%%{NAME}' -f $(readlink /usr/lib64/libgdk-3.so -f))
@@ -95,7 +95,7 @@ This package contains the Python Gdk bindings for GObject.
 Summary:        Python bindings for GObject -- Cairo bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
-%if local_py_suffix == 2
+%if %local_py_suffix == 2
 Provides:       python2-gobject-cairo = %{version}
 %endif
 %define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo)
diff --git a/python3-gobject.spec b/python3-gobject.spec
index b7bf059..d1f4cb2 100644
--- a/python3-gobject.spec
+++ b/python3-gobject.spec
@@ -64,7 +64,7 @@ BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-gobject)
 # Trigger an automatic installation of python(3)?-gobject when python and libgirepository are installed.
 Supplements:    packageand(%{local_py_pkg}:libgirepository-1_0-1)
-%if local_py_suffix == 2
+%if %local_py_suffix == 2
 Provides:       python2-gobject = %{version}
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -79,7 +79,7 @@ Summary:        Python bindings for GObject -- Gdk bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 Requires:       %{name}-cairo = %{version}
-%if local_py_suffix == 2
+%if %local_py_suffix == 2
 Provides:       python2-gobject-Gdk = %{version}
 %endif
 %define gdk_real_package %(rpm -q --qf '%%{NAME}' -f $(readlink /usr/lib64/libgdk-3.so -f))
@@ -95,7 +95,7 @@ This package contains the Python Gdk bindings for GObject.
 Summary:        Python bindings for GObject -- Cairo bindings
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
-%if local_py_suffix == 2
+%if %local_py_suffix == 2
 Provides:       python2-gobject-cairo = %{version}
 %endif
 %define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo)

From 8553eadab72407bc93c1c30a60f2f1ea872b3d0193202632163fa5e006a0e92b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 20 Mar 2017 15:51:06 +0000
Subject: [PATCH 7/7] Accepting request 481402 from GNOME:Next

Update to 3.24.0

OBS-URL: https://build.opensuse.org/request/show/481402
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/python-gobject?expand=0&rev=77
---
 pygobject-3.22.0.tar.xz                 |  3 ---
 pygobject-3.24.0.tar.xz                 |  3 +++
 python-gobject-missing-prototypes.patch | 31 -------------------------
 python-gobject.changes                  | 14 +++++++++++
 python-gobject.spec                     |  7 ++----
 python3-gobject.changes                 | 14 +++++++++++
 python3-gobject.spec                    |  7 ++----
 7 files changed, 35 insertions(+), 44 deletions(-)
 delete mode 100644 pygobject-3.22.0.tar.xz
 create mode 100644 pygobject-3.24.0.tar.xz
 delete mode 100644 python-gobject-missing-prototypes.patch

diff --git a/pygobject-3.22.0.tar.xz b/pygobject-3.22.0.tar.xz
deleted file mode 100644
index a8687d3..0000000
--- a/pygobject-3.22.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7
-size 756820
diff --git a/pygobject-3.24.0.tar.xz b/pygobject-3.24.0.tar.xz
new file mode 100644
index 0000000..6aac065
--- /dev/null
+++ b/pygobject-3.24.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e228b1c0f36e810acd971fad1c7030014900d8427c308d63a560f3f1037fa3c
+size 758336
diff --git a/python-gobject-missing-prototypes.patch b/python-gobject-missing-prototypes.patch
deleted file mode 100644
index d92634b..0000000
--- a/python-gobject-missing-prototypes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d005df9645fd5fb2f19bd09384355f45591f1e58 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <creiter@src.gnome.org>
-Date: Mon, 23 Jan 2017 21:26:05 +0100
-Subject: Disable -Werror=missing-prototypes
-
-https://bugzilla.gnome.org/show_bug.cgi?id=760056
-added some code triggering "missing-prototype" which we by default
-treat as an error. This disables that specific error by default.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=777534
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c8d95c7..8e225f4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -228,7 +228,7 @@ AC_SUBST(INTROSPECTION_SCANNER)
- AC_SUBST(INTROSPECTION_COMPILER)
- 
- # compiler warnings, errors, required cflags, and code coverage support
--GNOME_COMPILE_WARNINGS([maximum])
-+GNOME_COMPILE_WARNINGS([maximum], [-Wno-error=missing-prototypes])
- AC_MSG_CHECKING(for Gnome code coverage support)
- m4_ifdef([GNOME_CODE_COVERAGE],
-          [AC_MSG_RESULT(yes)
--- 
-cgit v0.12
-
-
diff --git a/python-gobject.changes b/python-gobject.changes
index 26ff0dc..defe673 100644
--- a/python-gobject.changes
+++ b/python-gobject.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Mar 20 15:28:17 UTC 2017 - dimstar@opensuse.org
+
+- Update to version 3.24.0:
+  + overrides: Update for Gdk-4.0 and Gtk+-4.0 (bgo#773315,
+    bgo#777680).
+  + Disable -Werror=missing-prototypes (bgo#777534).
+  + Fix new PEP8 errors (bgo#776009).
+  + Move pep8/pyflakes tests from 'make check' to
+    'make check.quality' (bgo#764087).
+  + Handle exception unreffing Variant at exit (bgo#776092).
+  + Handle multiple deinit of callable cache (bgo#776092).
+- Drop python-gobject-missing-prototypes.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Wed Mar 15 19:38:20 UTC 2017 - toddrme2178@gmail.com
 
diff --git a/python-gobject.spec b/python-gobject.spec
index 1329168..9522e43 100644
--- a/python-gobject.spec
+++ b/python-gobject.spec
@@ -40,14 +40,12 @@ Name:           python-gobject
 Summary:        Python bindings for GObject
 License:        LGPL-2.1+
 Group:          Development/Libraries/Python
-Version:        3.22.0
+Version:        3.24.0
 Release:        0
 Url:            https://wiki.gnome.org/Projects/PyGObject/
-Source:         http://download.gnome.org/sources/pygobject/3.22/%{_name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/pygobject/3.24/%{_name}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM pycompile-searchpath.patch jmatejek@suse.com -- Fix build with python 3.4
 Patch1:         pycompile-searchpath.patch
-# PATCH-FIX-UPSTREAM python-gobject-missing-prototypes.patch bgo#777534 dimstar@opensuse.org -- Disable -Werror=missing-prototypes, taken from git commit d005df
-Patch2:         python-gobject-missing-prototypes.patch
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel >= 2.38.0
 BuildRequires:  gnome-common
@@ -129,7 +127,6 @@ addon libraries such as pygtk.
 %prep
 %setup -q -n %{_name}-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -fiv
diff --git a/python3-gobject.changes b/python3-gobject.changes
index 26ff0dc..defe673 100644
--- a/python3-gobject.changes
+++ b/python3-gobject.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Mar 20 15:28:17 UTC 2017 - dimstar@opensuse.org
+
+- Update to version 3.24.0:
+  + overrides: Update for Gdk-4.0 and Gtk+-4.0 (bgo#773315,
+    bgo#777680).
+  + Disable -Werror=missing-prototypes (bgo#777534).
+  + Fix new PEP8 errors (bgo#776009).
+  + Move pep8/pyflakes tests from 'make check' to
+    'make check.quality' (bgo#764087).
+  + Handle exception unreffing Variant at exit (bgo#776092).
+  + Handle multiple deinit of callable cache (bgo#776092).
+- Drop python-gobject-missing-prototypes.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Wed Mar 15 19:38:20 UTC 2017 - toddrme2178@gmail.com
 
diff --git a/python3-gobject.spec b/python3-gobject.spec
index d1f4cb2..6c49709 100644
--- a/python3-gobject.spec
+++ b/python3-gobject.spec
@@ -40,14 +40,12 @@ Name:           python3-gobject
 Summary:        Python bindings for GObject
 License:        LGPL-2.1+
 Group:          Development/Libraries/Python
-Version:        3.22.0
+Version:        3.24.0
 Release:        0
 Url:            https://wiki.gnome.org/Projects/PyGObject/
-Source:         http://download.gnome.org/sources/pygobject/3.22/%{_name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/pygobject/3.24/%{_name}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM pycompile-searchpath.patch jmatejek@suse.com -- Fix build with python 3.4
 Patch1:         pycompile-searchpath.patch
-# PATCH-FIX-UPSTREAM python-gobject-missing-prototypes.patch bgo#777534 dimstar@opensuse.org -- Disable -Werror=missing-prototypes, taken from git commit d005df
-Patch2:         python-gobject-missing-prototypes.patch
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel >= 2.38.0
 BuildRequires:  gnome-common
@@ -129,7 +127,6 @@ addon libraries such as pygtk.
 %prep
 %setup -q -n %{_name}-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -fiv