rpms/PyQt4/devel PyQt-x11-gpl-4.5.2-QT_SHARED.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 PyQt4.spec, 1.28, 1.29 sources, 1.11, 1.12 PyQt-x11-gpl-4.4.4-QT_SHARED.patch, 1.1, NONE PyQt-x11-gpl-4.5.1-licenses.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

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


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

--- 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/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	16 Jun 2009 13:52:23 -0000	1.11
+++ .cvsignore	16 Jul 2009 13:36:54 -0000	1.12
@@ -1 +1 @@
-PyQt-x11-gpl-4.5.1.tar.gz
+PyQt-x11-gpl-4.5.2.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/PyQt4.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- PyQt4.spec	2 Jul 2009 19:52:40 -0000	1.28
+++ PyQt4.spec	16 Jul 2009 13:36:54 -0000	1.29
@@ -3,8 +3,8 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.5.1
-Release: 2%{?dist}
+Version: 4.5.2
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -16,8 +16,7 @@ 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
-Patch3:  PyQt-x11-gpl-4.5.1-licenses.patch
+Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
 Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
 
 BuildRequires: chrpath
@@ -62,7 +61,6 @@ of the Qt4 classes (e.g. KDE or your own
 
 %patch1 -p1 -b .64bit
 %patch2 -p1 -b .QT_SHARED
-%patch3 -p1 -b .licenses
 %patch4 -p1 
 
 ## permissions
@@ -139,6 +137,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	16 Jun 2009 13:52:24 -0000	1.11
+++ sources	16 Jul 2009 13:36:54 -0000	1.12
@@ -1 +1 @@
-80e877799ae8fb82f137c43fda18bff5  PyQt-x11-gpl-4.5.1.tar.gz
+997269d78aced5b1105edb155d49e248  PyQt-x11-gpl-4.5.2.tar.gz


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


--- PyQt-x11-gpl-4.5.1-licenses.patch DELETED ---