rpms/PyQt4/F-10 .cvsignore, 1.8, 1.9 PyQt4.spec, 1.18, 1.19 sources, 1.8, 1.9

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore PyQt4.spec sources 
Log Message:
* Tue Jun 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-1
- PyQt-4.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	30 Dec 2008 01:19:49 -0000	1.8
+++ .cvsignore	27 Jun 2009 02:56:09 -0000	1.9
@@ -1 +1 @@
-PyQt-x11-gpl-4.4.4.tar.gz
+PyQt-x11-gpl-4.5.1.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-10/PyQt4.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- PyQt4.spec	26 Apr 2009 17:42:17 -0000	1.18
+++ PyQt4.spec	27 Jun 2009 02:56:10 -0000	1.19
@@ -3,14 +3,15 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.4.4
-Release: 6%{?dist}
+Version: 4.5.1
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
 Group: 	 Development/Languages
 Url:     http://www.riverbankcomputing.com/software/pyqt/
 Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
+#Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}-snapshot-%{snap}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
@@ -21,6 +22,8 @@ BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
 BuildRequires: findutils
 BuildRequires: phonon-devel
+# beware of PyQt4/qscintilla bootstap issues
+BuildRequires: qscintilla
 BuildRequires: qt4-devel >= 4.5.0-7
 
 BuildRequires: python-devel
@@ -28,8 +31,8 @@ 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.7.9
-%global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1)
+BuildRequires: sip-devel >= 4.8.1
+%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
 Requires: sip >= %{sip_ver}
@@ -53,7 +56,7 @@ of the Qt4 classes (e.g. KDE or your own
 
 
 %prep
-%setup -q -n PyQt-x11-gpl-%{version}
+%setup -q -n PyQt-x11-gpl-%{version}%{?snap:-snapshot-%{snap}}
 
 %patch1 -p1 -b .64bit
 %patch2 -p1 -b .QT_SHARED
@@ -67,7 +70,8 @@ find examples/ -name "*.py" | xargs chmo
 QT4DIR=%{_qt4_prefix}
 PATH=%{_qt4_bindir}:$PATH ; export PATH
 
-echo yes | %{__python} configure.py \
+%{__python} configure.py \
+  --confirm-license \
   --qmake=%{_qt4_qmake} \
   --verbose 
 
@@ -79,7 +83,14 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
 
-# fix/remove rpath
+# fix/remove rpaths
+
+chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/QtCore.so
+chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/QtCore.so
+
+chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/QtGui.so
+chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/QtGui.so
+
 chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/QtDesigner.so
 chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/QtDesigner.so
 
@@ -120,9 +131,22 @@ rm -rf %{buildroot}
 %doc examples/
 %{_bindir}/*
 %{_datadir}/sip/PyQt4/
+%{_qt4_prefix}/qsci/api/python/PyQt4.api
 
 
 %changelog
+* Tue Jun 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-1
+- PyQt-4.5.1
+
+* Fri Jun 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5-1
+- PyQt-4.5
+
+* Thu May 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5-0.2.20090520
+- fix generation of sip_ver
+
+* Thu May 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5-0.1.20090520
+- PyQt-4.5-snapshot-20090520
+
 * Sun Apr 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.4-6
 - rebuild for phonon bindings (#497680)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	30 Dec 2008 01:19:49 -0000	1.8
+++ sources	27 Jun 2009 02:56:10 -0000	1.9
@@ -1 +1 @@
-4bd346d56d10452e47ac71e2cbe04229  PyQt-x11-gpl-4.4.4.tar.gz
+80e877799ae8fb82f137c43fda18bff5  PyQt-x11-gpl-4.5.1.tar.gz