rpms/PyQt4/F-13 PyQt4.spec,1.42,1.43

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/PyQt4/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29341

Modified Files:
	PyQt4.spec 
Log Message:
- fix multilib conflict because of timestamp




Index: PyQt4.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt4/F-13/PyQt4.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- PyQt4.spec	14 Feb 2010 20:52:23 -0000	1.42
+++ PyQt4.spec	23 Feb 2010 12:43:05 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -18,6 +18,8 @@ Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
 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
 
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
@@ -33,7 +35,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.9.3
 
 Requires: dbus-python
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
@@ -60,6 +62,7 @@ of the Qt4 classes (e.g. KDE or your own
 %patch2 -p1 -b .QT_SHARED
 %patch3 -p1 -b .phonon
 %patch4 -p1 
+%patch5 -p1 -b .timestamp
 
 ## permissions
 # mark examples non-executable
@@ -143,6 +146,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Feb 23 2010 Than Ngo <than at redhat.com> - 4.7-3
+- fix multilib conflict because of timestamp
+
 * Sun Feb 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7-2
 - rebuild