rpms/PyQt4/F-13 PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 PyQt4.spec, 1.45, 1.46 sources, 1.18, 1.19

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv345

Modified Files:
	.cvsignore PyQt4.spec sources 
Added Files:
	PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch 
Log Message:
4.7.2


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

--- NEW FILE PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch ---
diff -up PyQt-x11-gpl-4.7.2/configure.py.fix-implicit-linking PyQt-x11-gpl-4.7.2/configure.py
--- PyQt-x11-gpl-4.7.2/configure.py.fix-implicit-linking	2010-03-18 07:08:13.000000000 -0500
+++ PyQt-x11-gpl-4.7.2/configure.py	2010-03-18 07:09:46.157734414 -0500
@@ -1173,7 +1173,7 @@ def compile_qt_program(name, mname, extr
     opengl = (mname == "QtOpenGL")
 
     qt = [mname]
-    if mname in ("QtOpenGL", "QtWebKit"):
+    if mname in ("QtOpenGL", "QtWebKit", "QtAssistant", "QtHelp"):
         qt.append("QtCore")
 
     makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-13/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	15 Jan 2010 17:06:05 -0000	1.18
+++ .cvsignore	25 Mar 2010 19:22:38 -0000	1.19
@@ -1 +1 @@
-PyQt-x11-gpl-4.7.tar.gz
+PyQt-x11-gpl-4.7.2.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-13/PyQt4.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- PyQt4.spec	14 Mar 2010 02:16:45 -0000	1.45
+++ PyQt4.spec	25 Mar 2010 19:22:38 -0000	1.46
@@ -3,8 +3,8 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.7
-Release: 5%{?dist}
+Version: 4.7.2
+Release: 2%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -16,12 +16,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
 Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
-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
-# fix implicit linking when checking for QtHelp and QtAssistant
-Patch6:  PyQt-x11-gpl-4.7-fix-implicit-linking.patch
+# fix implicit linking when checking for QtAssistant, QtHelp
+Patch6:  PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch
 
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
@@ -38,7 +37,7 @@ BuildRequires: python-devel
 %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)")
 
-BuildRequires: sip-devel >= 4.10
+BuildRequires: sip-devel >= 4.10.1
 
 Requires: dbus-python
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
@@ -63,7 +62,6 @@ of the Qt4 classes (e.g. KDE or your own
 
 %patch1 -p1 -b .64bit
 %patch2 -p1 -b .QT_SHARED
-%patch3 -p1 -b .phonon
 %patch4 -p1 
 %patch5 -p1 -b .timestamp
 %patch6 -p1 -b .fix-implicit-linking
@@ -153,6 +151,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Mar 21 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.7.2-2
+- rebuild against fixed qt to get QtMultimedia detected properly
+
+* Thu Mar 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.2-1
+- PyQt-x11-gpl-4.7.2
+
 * 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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-13/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	15 Jan 2010 17:06:05 -0000	1.18
+++ sources	25 Mar 2010 19:22:38 -0000	1.19
@@ -1 +1 @@
-4882179ab4da128aaa8520f146afb955  PyQt-x11-gpl-4.7.tar.gz
+e7782e9146ec8aa0e76bcdb0ca5b9491  PyQt-x11-gpl-4.7.2.tar.gz