rpms/PyQt4/F-8 PyQt-x11-gpl-4.3.1-64bit.patch, NONE, 1.1 PyQt-x11-gpl-4.3.1-QT_SHARED.patch, NONE, 1.1 PyQt4.spec, 1.2, 1.3 sources, 1.2, 1.3 PyQt-x11-gpl-4.2-64bit.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8024

Modified Files:
	PyQt4.spec sources 
Added Files:
	PyQt-x11-gpl-4.3.1-64bit.patch 
	PyQt-x11-gpl-4.3.1-QT_SHARED.patch 
Removed Files:
	PyQt-x11-gpl-4.2-64bit.patch 
Log Message:
* Mon Nov 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-1
- PyQt-4.3.1


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

--- NEW FILE PyQt-x11-gpl-4.3.1-64bit.patch ---
diff -up PyQt-x11-gpl-4.3.1/configure.py.64bit PyQt-x11-gpl-4.3.1/configure.py
--- PyQt-x11-gpl-4.3.1/configure.py.64bit	2007-10-22 20:50:50.000000000 -0500
+++ PyQt-x11-gpl-4.3.1/configure.py	2007-10-22 20:53:13.000000000 -0500
@@ -722,16 +722,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.3.1-QT_SHARED.patch:

--- NEW FILE PyQt-x11-gpl-4.3.1-QT_SHARED.patch ---
diff -up PyQt-x11-gpl-4.3.1/configure.py.QT_SHARED PyQt-x11-gpl-4.3.1/configure.py
--- PyQt-x11-gpl-4.3.1/configure.py.QT_SHARED	2007-10-22 14:28:02.000000000 -0500
+++ PyQt-x11-gpl-4.3.1/configure.py	2007-10-22 14:31:04.000000000 -0500
@@ -1651,11 +1651,11 @@ int main(int, char **)
     out << QLibraryInfo::location(QLibraryInfo::DataPath) << '\\n';
     out << QLibraryInfo::location(QLibraryInfo::PluginsPath) << '\\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: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-8/PyQt4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PyQt4.spec	30 Oct 2007 14:08:48 -0000	1.2
+++ PyQt4.spec	12 Nov 2007 20:00:59 -0000	1.3
@@ -3,8 +3,8 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.2
-Release: 9%{?dist}
+Version: 4.3.1
+Release: 1%{?dist}
 
 License: GPLv2
 Group: 	 Development/Languages
@@ -12,10 +12,10 @@
 Source0: http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source1: pyuic4.sh
-
 Patch1:  PyQt-x11-gpl-4.1.1-qconfig_h.patch
-Patch2:  PyQt-x11-gpl-4.2-64bit.patch
+Patch2:  PyQt-x11-gpl-4.3.1-64bit.patch
+# HACK! FIXME: ping upstream why this isn't working right. -- Rex
+Patch3:  PyQt-x11-gpl-4.3.1-QT_SHARED.patch
 
 BuildRequires: qt4-devel
 BuildRequires: chrpath
@@ -26,7 +26,7 @@
 #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.6
+BuildRequires: sip-devel >= 4.7.1
 %global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1)
 %if "%{?sip_ver}" > "3"
 # To be paranoid, could change >= to = -- Rex
@@ -58,6 +58,8 @@
 
 %patch2 -p1 -b .64bit
 
+%patch3 -p1 -b .QT_SHARED
+
 # mark examples non-executable
 find examples/ -name "*.py" | xargs chmod a-x
 
@@ -66,13 +68,15 @@
 
 QT4DIR=%{_qt4_prefix}
 PATH=%{_qt4_bindir}:$PATH ; export PATH
+
 # configure.py isn't smart enough to either use qmake or QMAKEPATH
 QMAKESPEC=$QT4DIR/mkspecs/linux-g++; export QMAKESPEC
 %if "%{_lib}" == "lib64"
 QMAKESPEC=$QT4DIR/mkspecs/linux-g++-64 ; export QMAKESPEC
 %endif
 
-echo yes | %{__python} configure.py -w -d %{python_sitearch}/PyQt4
+echo yes | %{__python} configure.py --verbose 
+# --destdir=%{python_sitearch}
 
 make %{?_smp_mflags}
 
@@ -83,14 +87,20 @@
 make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
 
 # fix/remove rpath
+chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/QtDesigner.so
 chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/QtDesigner.so
 
 # non-executable script
 chmod 755 %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py
 
-# fix multiarch conflict (#343001) 
-rm -f %{buildroot}%{_bindir}/pyuic4
-install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/pyuic4
+# missing shebang
+cp -a %{buildroot}%{_bindir}/pyuic4 %{buildroot}%{_bindir}/pyuic4.ORIG
+cat > %{buildroot}%{_bindir}/pyuic4 <<EOF
+#!/bin/sh
+
+EOF
+cat %{buildroot}%{_bindir}/pyuic4.ORIG >> %{buildroot}%{_bindir}/pyuic4
+rm -f %{buildroot}%{_bindir}/pyuic4.ORIG
 
 
 %clean
@@ -112,8 +122,8 @@
 
 
 %changelog
-* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-9
-- multiarch conflicts in PyQt4 (#343001)
+* Mon Nov 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-1
+- PyQt-4.3.1
 
 * Thu Oct 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-8
 - drop ExcludeArch: ppc64 , qt4 bug is (hopefully) fixed.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Oct 2007 21:01:00 -0000	1.2
+++ sources	12 Nov 2007 20:00:59 -0000	1.3
@@ -1 +1 @@
-af4baa7f7441914f9a527ef3cf788fef  PyQt-x11-gpl-4.2.tar.gz
+5d0095d7f08a973b4a04e09e7f6ab568  PyQt-x11-gpl-4.3.1.tar.gz


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