rpms/PyQt4/devel PyQt-x11-gpl-4.4.4-64bit.patch, NONE, 1.1 PyQt-x11-gpl-4.4.4-QT_SHARED.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 PyQt4.spec, 1.15, 1.16 sources, 1.7, 1.8 PyQt-x11-gpl-4.4.3-64bit.patch, 1.1, NONE PyQt-x11-gpl-4.4.3-QT_SHARED.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Mon Nov 17 16:39:27 UTC 2008 

Author: rdieter

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

Modified Files:
	.cvsignore PyQt4.spec sources 
Added Files:
	PyQt-x11-gpl-4.4.4-64bit.patch 
	PyQt-x11-gpl-4.4.4-QT_SHARED.patch 
Removed Files:
	PyQt-x11-gpl-4.4.3-64bit.patch 
	PyQt-x11-gpl-4.4.3-QT_SHARED.patch 
Log Message:
* Mon Nov 10 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.4-1
- PyQt-4.4.4


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

--- NEW FILE PyQt-x11-gpl-4.4.4-64bit.patch ---
diff -up PyQt-x11-gpl-4.4.4/configure.py.64bit PyQt-x11-gpl-4.4.4/configure.py
--- PyQt-x11-gpl-4.4.4/configure.py.64bit	2008-11-08 05:55:49.000000000 -0600
+++ PyQt-x11-gpl-4.4.4/configure.py	2008-11-10 14:01:14.000000000 -0600
@@ -756,16 +756,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["exec_prefix"], py_major, py_minor))):
-                    lib_dir_flag = quote("-L%s/lib" % ducfg["exec_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")
                     opts.designer_plugin = False

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

--- NEW FILE PyQt-x11-gpl-4.4.4-QT_SHARED.patch ---
diff -up PyQt-x11-gpl-4.4.4/configure.py.QT_SHARED PyQt-x11-gpl-4.4.4/configure.py
--- PyQt-x11-gpl-4.4.4/configure.py.QT_SHARED	2008-11-08 05:55:49.000000000 -0600
+++ PyQt-x11-gpl-4.4.4/configure.py	2008-11-10 13:58:50.000000000 -0600
@@ -1584,11 +1584,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
 
     // Determine which features should be disabled.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Aug 2008 14:59:54 -0000	1.7
+++ .cvsignore	17 Nov 2008 16:38:57 -0000	1.8
@@ -1 +1 @@
-PyQt-x11-gpl-4.4.3.tar.gz
+PyQt-x11-gpl-4.4.4.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/PyQt4.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PyQt4.spec	26 Aug 2008 14:59:54 -0000	1.15
+++ PyQt4.spec	17 Nov 2008 16:38:57 -0000	1.16
@@ -3,7 +3,7 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.4.3
+Version: 4.4.4
 Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
@@ -13,9 +13,9 @@
 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.4.3-64bit.patch
+Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
-Patch3:  PyQt-x11-gpl-4.4.3-QT_SHARED.patch
+Patch2:  PyQt-x11-gpl-4.4.4-QT_SHARED.patch
 
 BuildRequires: qt4-devel >= 4.4.0-10
 BuildRequires: chrpath
@@ -27,7 +27,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.7.7
+BuildRequires: sip-devel >= 4.7.9
 %global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1)
 %if "x%{?sip_ver}" != "x"
 # To be paranoid, could change >= to = -- Rex
@@ -54,8 +54,8 @@
 %prep
 %setup -q -n PyQt-x11-gpl-%{version}
 
-%patch2 -p1 -b .64bit
-%patch3 -p1 -b .QT_SHARED
+%patch1 -p1 -b .64bit
+%patch2 -p1 -b .QT_SHARED
 
 # mark examples non-executable
 find examples/ -name "*.py" | xargs chmod a-x
@@ -66,13 +66,9 @@
 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 --verbose 
+echo yes | %{__python} configure.py \
+  --qmake=%{_qt4_qmake} \
+  --verbose 
 
 make %{?_smp_mflags}
 
@@ -86,6 +82,9 @@
 chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/QtDesigner.so
 chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/QtDesigner.so
 
+chrpath --list   %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so
+chrpath --delete %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so
+
 # non-executable script
 chmod 755 %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py
 
@@ -110,6 +109,7 @@
 %doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
 %doc LICENSE.GPL3
 %{python_sitearch}/PyQt4/
+# fixme?  -> sitearch?  -- Rex
 %{python_sitelib}/dbus/mainloop/qt.so
 
 %files devel
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Mon Nov 10 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.4-1
+- PyQt-4.4.4
+
 * Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-1
 - PyQt-4.4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Aug 2008 14:59:54 -0000	1.7
+++ sources	17 Nov 2008 16:38:57 -0000	1.8
@@ -1 +1 @@
-89e84c36a8520bf8b3a8a2b20e765154  PyQt-x11-gpl-4.4.3.tar.gz
+4bd346d56d10452e47ac71e2cbe04229  PyQt-x11-gpl-4.4.4.tar.gz


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


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

More information about the fedora-extras-commits mailing list