rpms/PyQt4/devel PyQt-x11-gpl-4.4.3-64bit.patch, NONE, 1.1 PyQt-x11-gpl-4.4.3-QT_SHARED.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 PyQt4.spec, 1.14, 1.15 sources, 1.6, 1.7 PyQt-x11-gpl-4.1.1-qconfig_h.patch, 1.1, NONE PyQt-x11-gpl-4.3.1-64bit.patch, 1.1, NONE PyQt-x11-gpl-4.3.1-QT_SHARED.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore PyQt4.spec sources 
Added Files:
	PyQt-x11-gpl-4.4.3-64bit.patch 
	PyQt-x11-gpl-4.4.3-QT_SHARED.patch 
Removed Files:
	PyQt-x11-gpl-4.1.1-qconfig_h.patch 
	PyQt-x11-gpl-4.3.1-64bit.patch 
	PyQt-x11-gpl-4.3.1-QT_SHARED.patch 
Log Message:
* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-1
- PyQt-4.4.3


PyQt-x11-gpl-4.4.3-64bit.patch:

--- NEW FILE PyQt-x11-gpl-4.4.3-64bit.patch ---
diff -up PyQt-x11-gpl-4.4.3/configure.py.64bit PyQt-x11-gpl-4.4.3/configure.py
--- PyQt-x11-gpl-4.4.3/configure.py.64bit	2008-08-08 09:09:58.000000000 -0500
+++ PyQt-x11-gpl-4.4.3/configure.py	2008-08-14 10:38:22.000000000 -0500
@@ -755,16 +755,15 @@ include(%s)
             else:
                 # Use distutils to get the additional configuration.
                 from distutils.sysconfig import get_config_vars
+                from distutils.sysconfig import get_python_lib
                 ducfg = get_config_vars()
 
                 if sys.platform == "darwin":
                     # We need to work out how to specify the right framework
                     # version.
                     link = "-framework Python"
-                elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and
-                      glob.glob("%s/lib/libpython%d.%d*" % (ducfg["prefix"], py_major, py_minor))):
-                    lib_dir_flag = quote("-L%s/lib" % ducfg["prefix"])
-                    link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor)
+                elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") ): 
+                    link = "-L%s -lpython%d.%d" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor)
                 else:
                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")
                     enabled = False

PyQt-x11-gpl-4.4.3-QT_SHARED.patch:

--- NEW FILE PyQt-x11-gpl-4.4.3-QT_SHARED.patch ---
diff -up PyQt-x11-gpl-4.4.3/configure.py.QT_SHARED PyQt-x11-gpl-4.4.3/configure.py
--- PyQt-x11-gpl-4.4.3/configure.py.QT_SHARED	2008-08-14 10:38:22.000000000 -0500
+++ PyQt-x11-gpl-4.4.3/configure.py	2008-08-14 10:38:22.000000000 -0500
@@ -1579,11 +1579,11 @@ int main(int, char **)
     out << QT_VERSION << '\\n';
     out << QT_EDITION << '\\n';
 
-#if defined(QT_SHARED) || defined(QT_DLL)
+//#if defined(QT_SHARED) || defined(QT_DLL)
     out << "shared\\n";
-#else
-    out << "\\n";
-#endif
+//#else
+//    out << "\\n";
+//#endif
 
 #if defined(QT_NO_ACCESSIBILITY)
     out << "PyQt_Accessibility\\n";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 May 2008 12:30:00 -0000	1.6
+++ .cvsignore	26 Aug 2008 14:59:54 -0000	1.7
@@ -1 +1 @@
-PyQt-x11-gpl-4.4.2.tar.gz
+PyQt-x11-gpl-4.4.3.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/PyQt4.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PyQt4.spec	14 Jun 2008 21:40:06 -0000	1.14
+++ PyQt4.spec	26 Aug 2008 14:59:54 -0000	1.15
@@ -3,19 +3,19 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.4.2
-Release: 2%{?dist}
+Version: 4.4.3
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
 Group: 	 Development/Languages
-Url: 	 http://www.riverbankcomputing.co.uk/pyqt/
-Source0: http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
+Url:     http://www.riverbankcomputing.com/software/pyqt/
+Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch2:  PyQt-x11-gpl-4.3.1-64bit.patch
+Patch2:  PyQt-x11-gpl-4.4.3-64bit.patch
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
-Patch3:  PyQt-x11-gpl-4.3.1-QT_SHARED.patch
+Patch3:  PyQt-x11-gpl-4.4.3-QT_SHARED.patch
 
 BuildRequires: qt4-devel >= 4.4.0-10
 BuildRequires: chrpath
@@ -27,14 +27,15 @@
 %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.7.6
+BuildRequires: sip-devel >= 4.7.7
 %global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1)
-%if "%{?sip_ver}" > "3"
+%if "x%{?sip_ver}" != "x"
 # To be paranoid, could change >= to = -- Rex
 Requires: sip >= %{sip_ver}
 %endif
 
 Requires: dbus-python
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 
 %description
 These are Python bindings for Qt4.
@@ -121,6 +122,9 @@
 
 
 %changelog
+* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-1
+- PyQt-4.4.3
+
 * Sat Jun 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.2-2
 - PyQt4 is built without QtWebKit support (#451490)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 May 2008 12:30:00 -0000	1.6
+++ sources	26 Aug 2008 14:59:54 -0000	1.7
@@ -1 +1 @@
-a3f1e828fe74242441f17020c10ba06b  PyQt-x11-gpl-4.4.2.tar.gz
+89e84c36a8520bf8b3a8a2b20e765154  PyQt-x11-gpl-4.4.3.tar.gz


--- PyQt-x11-gpl-4.1.1-qconfig_h.patch DELETED ---


--- PyQt-x11-gpl-4.3.1-64bit.patch DELETED ---


--- PyQt-x11-gpl-4.3.1-QT_SHARED.patch DELETED ---