5.4
This commit is contained in:
parent
dbecf1a3b8
commit
7da544d151
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/PyQt-gpl-5.3.2.tar.gz
|
||||
/PyQt-gpl-5.4.tar.gz
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -up PyQt-gpl-5.3.2/configure.py.add-dep-to-QtWebKitWidgets PyQt-gpl-5.3.2/configure.py
|
||||
--- PyQt-gpl-5.3.2/configure.py.add-dep-to-QtWebKitWidgets 2014-09-12 16:58:40.000000000 -0500
|
||||
+++ PyQt-gpl-5.3.2/configure.py 2014-11-06 07:54:42.829242627 -0600
|
||||
@@ -87,7 +87,7 @@ MODULE_METADATA = {
|
||||
'QtSvg': ModuleMetadata(qmake_QT=['svg']),
|
||||
'QtTest': ModuleMetadata(qmake_QT=['testlib', 'widgets']),
|
||||
'QtWebKit': ModuleMetadata(qmake_QT=['webkit', 'network']),
|
||||
- 'QtWebKitWidgets': ModuleMetadata(qmake_QT=['webkitwidgets']),
|
||||
+ 'QtWebKitWidgets': ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport']),
|
||||
'QtWebSockets': ModuleMetadata(qmake_QT=['websockets']),
|
||||
'QtWidgets': ModuleMetadata(qmake_QT=['widgets']),
|
||||
'QtWinExtras': ModuleMetadata(qmake_QT=['winextras', 'widgets']),
|
@ -10,8 +10,8 @@
|
||||
|
||||
Summary: Python bindings for Qt5
|
||||
Name: python-qt5
|
||||
Version: 5.3.2
|
||||
Release: 6%{?dist}
|
||||
Version: 5.4
|
||||
Release: 1%{?dist}
|
||||
|
||||
# all BSD, except for GPLv2+ dbus bindings and examples
|
||||
License: BSD and GPLv2+
|
||||
@ -25,8 +25,6 @@ Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQ
|
||||
## upstream patches
|
||||
|
||||
## upstreamable patches
|
||||
# fix build, https://bugzilla.redhat.com/1160932
|
||||
Patch1: PyQt5-5.3.2-add-dep-to-QtWebKitWidgets.patch
|
||||
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: findutils
|
||||
@ -49,10 +47,10 @@ BuildRequires: pkgconfig(Qt5X11Extras)
|
||||
BuildRequires: pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns)
|
||||
BuildRequires: pkgconfig(Qt5WebKit) pkgconfig(Qt5WebKitWidgets)
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: sip-devel >= 4.16
|
||||
BuildRequires: sip-devel >= 4.16.5
|
||||
%if 0%{?with_python3}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-sip-devel >= 4.16
|
||||
BuildRequires: python3-sip-devel >= 4.16.5
|
||||
BuildRequires: python3-dbus
|
||||
%endif # with_python3
|
||||
|
||||
@ -110,8 +108,6 @@ BuildArch: noarch
|
||||
%prep
|
||||
%setup -n PyQt-gpl-%{version}%{?snap:-snapshot-%{snap}}
|
||||
|
||||
%patch1 -p1 -b .add-dep-to-QtWebKitWidgets
|
||||
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
@ -258,6 +254,9 @@ rm -rfv %{buildroot}%{python3_sitearch}/PyQt5/uic/port_v2/
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Dec 26 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4-1
|
||||
- 5.4
|
||||
|
||||
* Thu Nov 13 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.2-6
|
||||
- restore python3 support
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user