rpms/PyQt4/F-11 PyQt-x11-gpl-4.5.1-pyuic_shebang.patch, NONE, 1.1 PyQt-x11-gpl-4.5.2-QT_SHARED.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 PyQt4.spec, 1.23, 1.24 sources, 1.9, 1.10 PyQt-x11-gpl-4.4.4-QT_SHARED.patch, 1.1, NONE

Tue Aug 4 20:02:12 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15393

Modified Files:
	.cvsignore PyQt4.spec sources 
Added Files:
	PyQt-x11-gpl-4.5.1-pyuic_shebang.patch 
	PyQt-x11-gpl-4.5.2-QT_SHARED.patch 
Removed Files:
	PyQt-x11-gpl-4.4.4-QT_SHARED.patch 
Log Message:
* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.4-1
- PyQt4-4.5.4


PyQt-x11-gpl-4.5.1-pyuic_shebang.patch:
 pyuic.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE PyQt-x11-gpl-4.5.1-pyuic_shebang.patch ---
diff -up PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py
--- PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang	2009-06-16 03:37:46.000000000 -0500
+++ PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py	2009-07-02 14:01:44.218147410 -0500
@@ -1,3 +1,5 @@
+#!/usr/bin/python -tt
+
 import sys
 import optparse
 

PyQt-x11-gpl-4.5.2-QT_SHARED.patch:
 configure.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE PyQt-x11-gpl-4.5.2-QT_SHARED.patch ---
diff -up PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED PyQt-x11-gpl-4.5.2/configure.py
--- PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED	2009-07-16 08:34:48.419358104 -0500
+++ PyQt-x11-gpl-4.5.2/configure.py	2009-07-16 08:34:54.260358064 -0500
@@ -1679,11 +1679,11 @@ int main(int, char **)
 
     out << QLibraryInfo::licensee() << '\\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/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	27 Jun 2009 02:54:46 -0000	1.9
+++ .cvsignore	4 Aug 2009 20:02:12 -0000	1.10
@@ -1 +1 @@
-PyQt-x11-gpl-4.5.1.tar.gz
+PyQt-x11-gpl-4.5.4.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-11/PyQt4.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- PyQt4.spec	27 Jun 2009 02:54:46 -0000	1.23
+++ PyQt4.spec	4 Aug 2009 20:02:12 -0000	1.24
@@ -3,7 +3,7 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.5.1
+Version: 4.5.4
 Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
@@ -16,7 +16,8 @@ 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.4.4-QT_SHARED.patch
+Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
+Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
 
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
@@ -31,7 +32,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.8.1
+BuildRequires: sip-devel >= 4.8.2
 %global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1 | cut -d- -f1)
 %if "x%{?sip_ver}" != "x"
 # To be paranoid, could change >= to = -- Rex
@@ -60,9 +61,12 @@ of the Qt4 classes (e.g. KDE or your own
 
 %patch1 -p1 -b .64bit
 %patch2 -p1 -b .QT_SHARED
+%patch4 -p1 
 
+## permissions
 # mark examples non-executable
 find examples/ -name "*.py" | xargs chmod a-x
+chmod a+rx pyuic/uic/pyuic.py
 
 
 %build
@@ -84,7 +88,6 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
 
 # fix/remove rpaths
-
 chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/QtCore.so
 chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/QtCore.so
 
@@ -97,17 +100,12 @@ chrpath --delete %{buildroot}%{python_si
 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
-
-# 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
+# HACK: fix multilb conflict, http://bugzilla.redhat.com/509415
+rm -fv %{buildroot}%{_bindir}/pyuic4
+mv %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py \
+   %{buildroot}%{_bindir}/pyuic4
+ln -s %{_bindir}/pyuic4 \
+      %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py
 
 
 %clean
@@ -121,6 +119,7 @@ rm -rf %{buildroot}
 %doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
 %doc LICENSE.GPL3
 %{python_sitearch}/PyQt4/
+%exclude %{python_sitearch}/PyQt4/uic/pyuic.py*
 # fixme?  -> sitearch?  -- Rex
 %{python_sitelib}/dbus/mainloop/qt.so
 %{_qt4_plugindir}/designer/*
@@ -129,12 +128,28 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc doc/*
 %doc examples/
-%{_bindir}/*
+%{_bindir}/pylupdate4
+%{_bindir}/pyrcc4
+%{_bindir}/pyuic4
+%{python_sitearch}/PyQt4/uic/pyuic.py*
 %{_datadir}/sip/PyQt4/
 %{_qt4_prefix}/qsci/api/python/PyQt4.api
 
 
 %changelog
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.4-1
+- PyQt4-4.5.4
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-1
+- PyQt4-4.5.2
+
+* Thu Jul 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-2
+- fix build with qt-4.5.2
+- PyQt4-devel multilib conflict (#509415)
+
 * Tue Jun 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-1
 - PyQt-4.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	27 Jun 2009 02:54:46 -0000	1.9
+++ sources	4 Aug 2009 20:02:12 -0000	1.10
@@ -1 +1 @@
-80e877799ae8fb82f137c43fda18bff5  PyQt-x11-gpl-4.5.1.tar.gz
+b721266d14c450dd7045025e042819ec  PyQt-x11-gpl-4.5.4.tar.gz


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


