[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    rdieter pushed to PyQt4 (f29).  "4.12.2"
From:       notifications () fedoraproject ! org
Date:       2018-08-24 20:38:41
Message-ID: 20180824203841.9B89E635BB4B () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

Notification time stamped 2018-08-24 20:38:36 UTC

From 98f40500e7c8c0d78a8fa48026c50e8dfb96b0bf Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Aug 14 2018 21:20:44 +0000
Subject: 4.12.2


---

diff --git a/.gitignore b/.gitignore
index f4e1e1e..2190e68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /PyQt4_gpl_x11-4.12.1.tar.gz
+/PyQt4_gpl_x11-4.12.2.tar.gz
diff --git a/PyQt4.spec b/PyQt4.spec
index 4448d81..9fdcca6 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -1,4 +1,3 @@
-
 %if 0%{?fedora} || 0%{?rhel} > 7
 %global with_python3 1
 %global qtassistant 1
@@ -29,8 +28,8 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.12.1
-Release: 10%{?dist}
+Version: 4.12.2
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: (GPLv3 or GPLv2 with exceptions) and BSD
@@ -65,23 +64,22 @@ BuildRequires: pkgconfig(QtScript) pkgconfig(QtScriptTools)
 BuildRequires: pkgconfig(QtSql) pkgconfig(QtSvg) pkgconfig(QtTest)
 BuildRequires: pkgconfig(QtXml) pkgconfig(QtXmlPatterns)
 BuildRequires: python2-devel
-#if 0%{?fedora} > f28
-BuildRequires: python2-sip
-BuildRequires: python2-sip-devel >= 4.19
-#else
-#BuildRequires: sip-devel >= 4.19
-#endif
+%global sip_ver 4.19.12
+BuildRequires: python2-pyqt4-sip >= %{sip_ver}
+BuildRequires: python2-sip >= %{sip_ver}
+BuildRequires: python2-sip-devel >= %{sip_ver}
 
 %if 0%{?with_python3}
 BuildRequires: python3-dbus
 BuildRequires: python3-devel 
-BuildRequires: python3-sip
-BuildRequires: python3-sip-devel >= 4.19
+BuildRequires: python3-pyqt4-sip >= %{sip_ver}
+BuildRequires: python3-sip >= %{sip_ver}
+BuildRequires: python3-sip-devel >= %{sip_ver}
 %endif # with_python3
 
 Requires: %{python2_dbus}
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
-%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
+%{?_sip_api:Requires: python2-pyqt4-sip-api(%{_sip_api_major}) >= %{_sip_api}}
 
 %if 0%{?webkit}
 # when -webkit was split out
@@ -190,7 +188,7 @@ Requires:  python3-PyQt4%{?_isa} = %{version}-%{release}
 Summary: Python 3 bindings for Qt4
 Requires: python3-dbus
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
-%{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}}
+%{?_sip_api:Requires: python3-pyqt4-sip-api(%{_sip_api_major}) >= %{_sip_api}}
 %if 0%{?webkit}
 Obsoletes: python3-PyQt4 < 4.11.4-8
 %endif
@@ -268,7 +266,6 @@ popd
 
 
 %install
-
 # Install Python 3 first, and move aside any executables, to avoid clobbering
 # the Python 2 installation:
 %if 0%{?with_python3}
@@ -279,6 +276,7 @@ mkdir -p %{buildroot}%{_datadir}/python3-sip
 cp -alf %{buildroot}%{py3_sipdir} \
         %{buildroot}%{_datadir}/python3-sip/PyQt4
 %endif
+mkdir %{buildroot}%{python3_sitearch}/PyQt4/__pycache__/ ||:
 %endif # with_python3
 
 make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} -C %{_target_platform}
@@ -411,6 +409,9 @@ diff -u ./sip/QtGui/opengl_types.sip.orig \
 
 
 %changelog
+* Tue Aug 14 2018 Rex Dieter <rdieter@fedoraproject.org> - 4.12.2-0.1
+- 4.12.2
+
 * Sun Jul 15 2018 Rex Dieter <rdieter@fedoraproject.org> - 4.12.1-10
 - use %%make_build %%license
 - -devel: drop dep on -webkit
diff --git a/sources b/sources
index f817911..3d942fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PyQt4_gpl_x11-4.12.1.tar.gz) = \
0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1
 +SHA512 (PyQt4_gpl_x11-4.12.2.tar.gz) = \
f7829ccdeb5978f0b2fc0376d31afb1a3a45bb288995403e3451b48f355d149447c1c2d1e1ac27477c1ecd1d15c332158139bf647ea6826d7c2e1ca512a4097b



	https://src.fedoraproject.org/rpms/PyQt4/c/98f40500e7c8c0d78a8fa48026c50e8dfb96b0bf?branch=f29
 _______________________________________________
scm-commits mailing list -- scm-commits@lists.fedoraproject.org
To unsubscribe send an email to scm-commits-leave@lists.fedoraproject.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/scm-commits@lists.fedoraproject.org/message/I6ZRH37BGPYN4H72VVXFILDJFCM3UPIQ/



[prev in list] [next in list] [prev in thread] [next in thread]