From 8117cd5d842ba54f2299a2136bb8d623e0056626 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Tue, 14 Aug 2018 14:33:04 -0500
Subject: [PATCH] 5.11.3.dev1808131157 snapshot enable dist-info, include in
 -base (#1558187)

---
 .gitignore                       |  1 +
 PyQt5_gpl-5.11.2-sip_check.patch | 21 ---------------------
 python-qt5.spec                  | 17 ++++++++++-------
 sources                          |  2 +-
 4 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 PyQt5_gpl-5.11.2-sip_check.patch

diff --git a/.gitignore b/.gitignore
index 288b591..3d0df2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /PyQt5_gpl-5.10.1.tar.gz
 /PyQt5_gpl-5.10.2.dev1805251538.tar.gz
 /PyQt5_gpl-5.11.2.tar.gz
+/PyQt5_gpl-5.11.3.dev1808131157.tar.gz
diff --git a/PyQt5_gpl-5.11.2-sip_check.patch b/PyQt5_gpl-5.11.2-sip_check.patch
deleted file mode 100644
index dd44dc2..0000000
--- a/PyQt5_gpl-5.11.2-sip_check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up PyQt5_gpl-5.11.2/configure.py.sip_check PyQt5_gpl-5.11.2/configure.py
---- PyQt5_gpl-5.11.2/configure.py.sip_check	2018-07-11 14:10:21.751437714 -0500
-+++ PyQt5_gpl-5.11.2/configure.py	2018-07-11 14:12:13.035482279 -0500
-@@ -647,7 +647,7 @@ class TargetConfiguration:
-         try:
-             from PyQt5 import sip
-         except ImportError:
--            error(
-+            inform(
-                     "Unable to import PyQt5.sip.  Make sure you have "
-                     "configured SIP to create a private copy of the sip "
-                     "module.")
-@@ -2919,7 +2919,7 @@ def check_sip(target_config):
-     try:
-         from PyQt5 import sip
-     except ImportError:
--        error(
-+        inform(
-                 "Unable to import PyQt5.sip.  Make sure you have configured "
-                 "SIP to create a private copy of the sip module.")
- 
diff --git a/python-qt5.spec b/python-qt5.spec
index d453695..c054b22 100644
--- a/python-qt5.spec
+++ b/python-qt5.spec
@@ -25,10 +25,12 @@
 # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/
 %undefine _strict_symbol_defs_build
 
+%global snap dev1808131157
+
 Summary: PyQt5 is Python bindings for Qt5
 Name:    python-qt5
-Version: 5.11.2
-Release: 3%{?dist}
+Version: 5.11.3
+Release: 0.1.%{snap}%{?dist}
 
 License: GPLv3
 Url:     http://www.riverbankcomputing.com/software/pyqt/
@@ -49,8 +51,6 @@ Source4: pyuic5.sh
 Patch0: python-qt5_sipdir.patch
 # support newer Qt5 releases than 5.11.1
 Patch1: PyQt5-Timeline.patch
-# make configure.py check for runtime PyQt5.sip dep informative (non-fatal)
-Patch2: PyQt5_gpl-5.11.2-sip_check.patch
 
 BuildRequires: chrpath
 BuildRequires: findutils
@@ -247,7 +247,6 @@ Requires:  python%{python3_pkgversion}-qt5%{?_isa} = %{version}-%{release}
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1 -b .sip_check
 
 
 %build
@@ -262,7 +261,6 @@ pushd %{_target_platform}
 %{__python2} ./configure.py \
   --assume-shared \
   --confirm-license \
-  --no-dist-info \
   --qmake=%{_qt5_qmake} \
   --qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci \
   --verbose \
@@ -282,7 +280,6 @@ pushd %{_target_platform}-python3
 %{__python3} ./configure.py \
   --assume-shared \
   --confirm-license \
-  --no-dist-info \
   --qmake=%{_qt5_qmake} \
   --no-qsci-api \
   %{?py3_sipdir:--sipdir=%{py3_sipdir}} \
@@ -389,6 +386,7 @@ sed -i \
 %license LICENSE
 %{python2_dbus_dir}/pyqt5.so
 %dir %{python2_sitearch}/PyQt5/
+%{python2_sitearch}/PyQt5-%{version}%{?snap:.%{snap}}.dist-info
 %{python2_sitearch}/PyQt5/__init__.py*
 %{python2_sitearch}/PyQt5/Qt.so
 %{python2_sitearch}/PyQt5/QtCore.so
@@ -461,6 +459,7 @@ sed -i \
 %license LICENSE
 %{python3_dbus_dir}/pyqt5.so
 %dir %{python3_sitearch}/PyQt5/
+%{python3_sitearch}/PyQt5-%{version}%{?snap:.%{snap}}.dist-info
 %{python3_sitearch}/PyQt5/__pycache__/
 %{python3_sitearch}/PyQt5/__init__.py*
 %{python3_sitearch}/PyQt5/Qt.*
@@ -509,6 +508,10 @@ sed -i \
 
 
 %changelog
+* Tue Aug 14 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-0.1.dev1808131157
+- 5.11.3.dev1808131157 snapshot
+- enable dist-info, include in -base (#1558187)
+
 * Tue Aug 14 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.2-3
 - support compat py3_sipdir
 - python3-qt5: fix sip-api dep
diff --git a/sources b/sources
index 56c8d22..50003bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PyQt5_gpl-5.11.2.tar.gz) = fc60246b5e1ca0d8aeef829fe20de9dd28b77e3c151532f9dbcd92c0deec12d8308cc799901aeec3f84af745e735053d2aaad2866ef64a2426cba343e08bc2c0
+SHA512 (PyQt5_gpl-5.11.3.dev1808131157.tar.gz) = 733c4ef235a0dff111a4f5402bddfc8223f2b4e96dc82fa2d2a11377bf243229bee8c8fe05a6b389fe2acc8ee3c9cdae15805242022bcc985e872751310de09a