|
@@ -1,7 +1,6 @@
|
|
%global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
|
|
%global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
|
|
%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
|
|
%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
|
|
%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
|
|
%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
|
|
-%global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1 | cut -d- -f1)
|
|
|
|
|
|
|
|
%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.2)
|
|
%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.2)
|
|
%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
|
|
%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
|
|
@@ -12,14 +11,14 @@ Name: PyQt4
|
|
Summary: Python bindings for Qt4
|
|
Summary: Python bindings for Qt4
|
|
Summary(ja): Qt4 の Python バインディング
|
|
Summary(ja): Qt4 の Python バインディング
|
|
Version: 4.8.3
|
|
Version: 4.8.3
|
|
-Release: 3%{?_dist_release}
|
|
|
|
|
|
+Release: 4%{?_dist_release}
|
|
|
|
|
|
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
|
|
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
|
|
License: GPLv3 or GPLv2 with exceptions
|
|
License: GPLv3 or GPLv2 with exceptions
|
|
Group: Development/Languages
|
|
Group: Development/Languages
|
|
URL: http://www.riverbankcomputing.com/software/pyqt/
|
|
URL: http://www.riverbankcomputing.com/software/pyqt/
|
|
Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
|
|
Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
|
|
-Patch1: PyQt-x11-gpl-4.4.4-64bit.patch
|
|
|
|
|
|
+Patch1: PyQt-x11-gpl-4.8.3-64bit.patch
|
|
# HACK! FIXME: ping upstream why this isn't working right. -- Rex
|
|
# HACK! FIXME: ping upstream why this isn't working right. -- Rex
|
|
Patch2: PyQt-x11-gpl-4.5.2-QT_SHARED.patch
|
|
Patch2: PyQt-x11-gpl-4.5.2-QT_SHARED.patch
|
|
Patch4: PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
|
|
Patch4: PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
|
|
@@ -37,8 +36,8 @@ BuildRequires: python-devel
|
|
# beware of PyQt4/qscintilla bootstap issues
|
|
# beware of PyQt4/qscintilla bootstap issues
|
|
#BuildRequires: qscintilla
|
|
#BuildRequires: qscintilla
|
|
BuildRequires: qt4-devel >= 4.5.0
|
|
BuildRequires: qt4-devel >= 4.5.0
|
|
-BuildRequires: sip-devel >= 4.9
|
|
|
|
-Requires: sip >= %{sip_ver}
|
|
|
|
|
|
+BuildRequires: sip-devel >= 4.12.1
|
|
|
|
+Requires: sip >= 4.12.1
|
|
Requires: dbus-python
|
|
Requires: dbus-python
|
|
Requires: qt4
|
|
Requires: qt4
|
|
|
|
|
|
@@ -49,7 +48,7 @@ These are Python bindings for Qt4.
|
|
Summary: Files needed to build other bindings based on Qt4
|
|
Summary: Files needed to build other bindings based on Qt4
|
|
Group: Development/Libraries
|
|
Group: Development/Libraries
|
|
Requires: %{name} = %{version}-%{release}
|
|
Requires: %{name} = %{version}-%{release}
|
|
-Requires: sip-devel >= 4.9
|
|
|
|
|
|
+Requires: sip-devel >= 4.12.1
|
|
|
|
|
|
%description devel
|
|
%description devel
|
|
Files needed to build other bindings for C++ classes that inherit from any
|
|
Files needed to build other bindings for C++ classes that inherit from any
|
|
@@ -58,7 +57,9 @@ of the Qt4 classes (e.g. KDE or your own).
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q -n PyQt-x11-gpl-%{version}
|
|
%setup -q -n PyQt-x11-gpl-%{version}
|
|
-#patch1 -p1 -b .64bit
|
|
|
|
|
|
+%ifarch x86_64
|
|
|
|
+%patch1 -p1 -b .64bit
|
|
|
|
+%endif
|
|
%patch2 -p1 -b .QT_SHARED
|
|
%patch2 -p1 -b .QT_SHARED
|
|
#patch4 -p1
|
|
#patch4 -p1
|
|
|
|
|
|
@@ -121,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
#{_qt4_prefix}/qsci/api/python/PyQt4.api
|
|
#{_qt4_prefix}/qsci/api/python/PyQt4.api
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Mar 13 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.3-4
|
|
|
|
+- re-add Patch1 (PyQt-x11-gpl-4.8.3-64bit.patch) (x86_64 only)
|
|
|
|
+- remove %%sip_ver
|
|
|
|
+
|
|
* Thu Mar 10 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.3-3
|
|
* Thu Mar 10 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.3-3
|
|
- rebuilt with qt4-4.7.2
|
|
- rebuilt with qt4-4.7.2
|
|
|
|
|