rpms/PyQt4/devel PyQt-x11-gpl-4.7-fix-implicit-linking.patch, NONE, 1.1 PyQt4.spec, 1.44, 1.45

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/PyQt4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20381/devel

Modified Files:
	PyQt4.spec 
Added Files:
	PyQt-x11-gpl-4.7-fix-implicit-linking.patch 
Log Message:
* Sun Mar 14 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.7-5
- fix implicit linking when checking for QtHelp and QtAssistant
- remove Python 3 code from Python 2.6 directory, fixes FTBFS (#564633)

PyQt-x11-gpl-4.7-fix-implicit-linking.patch:
 configure.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PyQt-x11-gpl-4.7-fix-implicit-linking.patch ---
diff -ur PyQt-x11-gpl-4.7/configure.py PyQt-x11-gpl-4.7-fix-implicit-linking/configure.py
--- PyQt-x11-gpl-4.7/configure.py	2010-01-14 15:36:17.000000000 +0100
+++ PyQt-x11-gpl-4.7-fix-implicit-linking/configure.py	2010-03-14 02:26:06.000000000 +0100
@@ -1102,7 +1102,7 @@
     opengl = (mname == "QtOpenGL")
 
     qt = [mname]
-    if mname == "QtWebKit":
+    if mname == "QtWebKit" or mname == 'QtHelp' or mname == 'QtAssistant':
         qt.append("QtCore")
 
     makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/PyQt4.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- PyQt4.spec	14 Mar 2010 00:42:17 -0000	1.44
+++ PyQt4.spec	14 Mar 2010 01:31:23 -0000	1.45
@@ -4,7 +4,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -19,7 +19,9 @@ Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.pa
 Patch3:  PyQt-x11-gpl-4.6.2-phonon.patch
 Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
 # fix multilib conflict because of timestamp
-Patch5:	PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
+Patch5:  PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
+# fix implicit linking when checking for QtHelp and QtAssistant
+Patch6:  PyQt-x11-gpl-4.7-fix-implicit-linking.patch
 
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
@@ -64,6 +66,7 @@ of the Qt4 classes (e.g. KDE or your own
 %patch3 -p1 -b .phonon
 %patch4 -p1 
 %patch5 -p1 -b .timestamp
+%patch6 -p1 -b .fix-implicit-linking
 
 ## permissions
 # mark examples non-executable
@@ -109,6 +112,9 @@ mv %{buildroot}%{python_sitearch}/PyQt4/
 ln -s %{_bindir}/pyuic4 \
       %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py
 
+# remove Python 3 code from Python 2.6 directory, fixes FTBFS (#564633)
+rm -rf %{buildroot}%{python_sitearch}/PyQt4/uic/port_v3/
+
 
 %check
 # verify phonon built ok
@@ -147,6 +153,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Mar 14 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.7-5
+- fix implicit linking when checking for QtHelp and QtAssistant
+- remove Python 3 code from Python 2.6 directory, fixes FTBFS (#564633)
+
 * Sat Mar 13 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.7-4
 - BR qt-assistant-adp-devel