Author: qboosh Date: Sun Jun 19 09:00:40 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated License (GPL v3 is allowed too; noted exception)
- updated APIs list
- separated -devel-tools (pylupdate4, pyrcc4, pyuic4) as not required at runtime
- dbus/mainloop tree belongs to python-dbus
---- Files affected:
packages/python-PyQt4:
python-PyQt4.spec (1.64 -> 1.65)
---- Diffs:
================================================================
Index: packages/python-PyQt4/python-PyQt4.spec
diff -u packages/python-PyQt4/python-PyQt4.spec:1.64
packages/python-PyQt4/python-PyQt4.spec:1.65
--- packages/python-PyQt4/python-PyQt4.spec:1.64 Wed Feb 23 16:53:20 2011
+++ packages/python-PyQt4/python-PyQt4.spec Sun Jun 19 11:00:34 2011
@@ -1,17 +1,16 @@
# $Revision$, $Date$
-# TODO:
-# - package /usr/lib/qt4/plugins/designer/* ?
-# - better place for %{py_sitedir}/dbus{,/mainloop} dirs ?
-
%define module PyQt4
-%define sipver 2:4.12.1
+# minimal required sip version
+%define sip_ver 2:4.12.1
+# last qt version covered by these bindings (minimal required is currently
4.1.0)
+%define qt_ver 4.7.1
Summary: Python bindings for the Qt4 toolkit
Summary(pl.UTF-8): Dowiązania do toolkitu Qt4 dla Pythona
Name: python-%{module}
Version: 4.8.3
-Release: 2
-License: GPL v2
+Release: 3
+License: GPL v2 or GPL v3 with FLOSS exception
Group: Libraries/Python
Source0:
http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
# Source0-md5: d54fd1c37a74864faf42709c8102f254
@@ -19,35 +18,34 @@
Patch1: %{name}-64bit.patch
URL: http://www.riverbankcomputing.com/software/pyqt/
# most of BR comes from configure.py
-BuildRequires: QtCore-devel
-BuildRequires: QtDeclarative-devel
-BuildRequires: QtDesigner-devel
-BuildRequires: QtGui-devel
-BuildRequires: QtHelp-devel
-BuildRequires: QtMultimedia-devel
-BuildRequires: QtNetwork-devel
-BuildRequires: QtOpenGL-devel
-BuildRequires: QtScript-devel
-BuildRequires: QtScriptTools-devel
-BuildRequires: QtSql-devel
-BuildRequires: QtSvg-devel
-BuildRequires: QtTest-devel
-BuildRequires: QtWebKit-devel
-BuildRequires: QtXml-devel
-BuildRequires: QtXmlPatterns-devel
+BuildRequires: QtCore-devel >= %{qt_ver}
+BuildRequires: QtDeclarative-devel >= %{qt_ver}
+BuildRequires: QtDesigner-devel >= %{qt_ver}
+BuildRequires: QtGui-devel >= %{qt_ver}
+BuildRequires: QtHelp-devel >= %{qt_ver}
+BuildRequires: QtMultimedia-devel >= %{qt_ver}
+BuildRequires: QtNetwork-devel >= %{qt_ver}
+BuildRequires: QtOpenGL-devel >= %{qt_ver}
+BuildRequires: QtScript-devel >= %{qt_ver}
+BuildRequires: QtScriptTools-devel >= %{qt_ver}
+BuildRequires: QtSql-devel >= %{qt_ver}
+BuildRequires: QtSvg-devel >= %{qt_ver}
+BuildRequires: QtTest-devel >= %{qt_ver}
+BuildRequires: QtWebKit-devel >= %{qt_ver}
+BuildRequires: QtXml-devel >= %{qt_ver}
+BuildRequires: QtXmlPatterns-devel >= %{qt_ver}
BuildRequires: phonon-devel
BuildRequires: pkgconfig
BuildRequires: python-dbus-devel >= 0.80
-BuildRequires: python-sip-devel >= %{sipver}
+BuildRequires: python-sip-devel >= %{sip_ver}
BuildRequires: qt4-build >= 4.3.3-3
-BuildRequires: qt4-phonon-devel
BuildRequires: qt4-qmake >= 4.3.3-3
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
BuildRequires: sed >= 4.0
%pyrequires_eq python-libs
-Requires: python-dbus
-Requires: python-sip >= %{sipver}
+Requires: python-dbus >= 0.80
+Requires: python-sip >= %{sip_ver}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLU.so.1
@@ -55,19 +53,21 @@
%description
PyQt4 is a set of Python bindings for the Qt4 toolkit. The bindings
-are implemented as a set of Python modules: QtCore, QtDesigner, QtGui,
-QtHelp, QtNetwork, QtOpenGL, QtScript, QtSql, QtSvg, QtTest, QtWebKit,
-QtXmlPatterns and QtXml.
+are implemented as a set of Python modules: QtCore, QtDeclarative,
+QtDesigner, QtGui, QtHelp, QtMultimedia, QtNetwork, QtOpenGL,
+QtScript, QtScriptTools, QtSql, QtSvg, QtTest, QtWebKit, QtXml,
+QtXmlPatterns and phonon.
%description -l pl.UTF-8
PyQt4 to zbiór dowiązań do Qt4 dla Pythona. Dowiązania zostały
-zaimplementowane jako moduły Pythona: QtCore, QtDesigner, QtGui,
-QtHelp, QtNetwork, QtOpenGL, QtScript, QtSql, QtSvg, QtTest, QtWebKit,
-QtXmlPatterns i QtXml.
+zaimplementowane jako moduły Pythona: QtCore, QtDeclarative,
+QtDesigner, QtGui, QtHelp, QtMultimedia, QtNetwork, QtOpenGL,
+QtScript, QtScriptTools, QtSql, QtSvg, QtTest, QtWebKit, QtXml,
+QtXmlPatterns oraz phonon.
%package devel
Summary: Files needed to build other bindings based on Qt4
-Summary(pl.UTF-8): Pliki potrzebne do budowania innych dowiązań bazowanych
na Qt4
+Summary(pl.UTF-8): Pliki potrzebne do budowania innych dowiązań opartych
na Qt4
Group: Development/Languages/Python
Requires: %{name} = %{version}-%{release}
Requires: python-sip-devel
@@ -80,6 +80,18 @@
Pliki potrzebne do budowania innych dowiązań do klas C++
dziedziczących z dowolnej klasy Qt4 (np. KDE lub własnych).
+%package devel-tools
+Summary: PyQt4 development tools
+Summary(pl.UTF-8): Narzędzia programistyczne PyQt4
+Group: X11/Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel-tools
+PyQt4 development tools: pylupdate4, pyrcc4, pyuic4.
+
+%description devel-tools -l pl.UTF-8
+Narzędzia programistyczne PyQt4: pylupdate4, pyrcc4, pyuic4.
+
%package examples
Summary: Examples for PyQt4
Summary(pl.UTF-8): Przykłady do PyQt4
@@ -118,7 +130,7 @@
%patch1 -p1
%build
-python configure.py \
+%{__python} configure.py \
--confirm-license \
-c -j 3 \
-a \
@@ -145,12 +157,12 @@
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
# don't use py_postclean, leave *.py in %{py_sitedir}/PyQt4/uic/widget-plugins
-rm $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/*.py
-rm $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/uic/*.py
-rm $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/uic/Compiler/*.py
-rm $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/uic/Loader/*.py
-rm $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/uic/port_v2/*.py
-rm $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/uic/port_v3/*.py
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/*.py
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/uic/*.py
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/uic/Compiler/*.py
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/uic/Loader/*.py
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/uic/port_v2/*.py
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/PyQt4/uic/port_v3/*.py
cp -R examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -159,21 +171,42 @@
%files
%defattr(644,root,root,755)
-%doc NEWS README THANKS
-%attr(755,root,root) %{_bindir}/*
+%doc GPL_EXCEPTION.TXT NEWS OPENSOURCE-NOTICE.TXT README THANKS
%attr(755,root,root) %{_libdir}/qt4/plugins/designer/libpythonplugin.so
%dir %{py_sitedir}/PyQt4
-%attr(755,root,root) %{py_sitedir}/PyQt4/*.so*
-%dir %{py_sitedir}/dbus
-%dir %{py_sitedir}/dbus/mainloop
+%attr(755,root,root) %{py_sitedir}/PyQt4/Qt.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtCore.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtDeclarative.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtDesigner.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtGui.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtHelp.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtMultimedia.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtNetwork.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtOpenGL.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtScript.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtScriptTools.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtSql.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtSvg.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtTest.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtWebKit.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtXml.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/QtXmlPatterns.so
+%attr(755,root,root) %{py_sitedir}/PyQt4/phonon.so
+%{py_sitedir}/PyQt4/__init__.py[co]
+%{py_sitedir}/PyQt4/pyqtconfig.py[co]
%attr(755,root,root) %{py_sitedir}/dbus/mainloop/qt.so
-%{py_sitedir}/PyQt4/*.py[co]
-%{py_sitedir}/PyQt4/uic
%files devel
%defattr(644,root,root,755)
%{_sipfilesdir}/PyQt4
+%files devel-tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/pylupdate4
+%attr(755,root,root) %{_bindir}/pyrcc4
+%attr(755,root,root) %{_bindir}/pyuic4
+%{py_sitedir}/PyQt4/uic
+
%files examples
%defattr(644,root,root,755)
%{_examplesdir}/%{name}-%{version}
@@ -188,6 +221,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.65 2011/06/19 09:00:34 qboosh
+- updated License (GPL v3 is allowed too; noted exception)
+- updated APIs list
+- separated -devel-tools (pylupdate4, pyrcc4, pyuic4) as not required at
runtime
+- dbus/mainloop tree belongs to python-dbus
+
Revision 1.64 2011/02/23 15:53:20 blekot
- rel 2
- rebuild against: ImportError:
/usr/lib64/python2.7/site-packages/PyQt4/QtCore.so: undefined symbol:
PyBool_Type
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-PyQt4/python-PyQt4.spec?r1=1.64&r2=1.65&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
