rpms/PyQt4/devel .cvsignore, 1.20, 1.21 PyQt4.spec, 1.50, 1.51 sources, 1.20, 1.21

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1716

Modified Files:
	.cvsignore PyQt4.spec sources 
Log Message:
* Wed Jul 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.4-1
- PyQt-x11-gpl-4.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	17 Apr 2010 20:45:47 -0000	1.20
+++ .cvsignore	14 Jul 2010 16:17:26 -0000	1.21
@@ -1 +1 @@
-PyQt-x11-gpl-4.7.3.tar.gz
+PyQt-x11-gpl-4.7.4.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/PyQt4.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- PyQt4.spec	9 May 2010 02:58:38 -0000	1.50
+++ PyQt4.spec	14 Jul 2010 16:17:27 -0000	1.51
@@ -1,12 +1,14 @@
 
 # Fedora review: http://bugzilla.redhat.com/190189
 
-%global with_python3 1
+%if 0%{?fedora} > 13
+#global with_python3 1
+%endif
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.7.3
-Release: 3%{?dist}
+Version: 4.7.4
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -40,15 +42,15 @@ 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.10.2
+BuildRequires: sip-devel >= 4.10.3
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel
-BuildRequires: python3-sip-devel >= 4.10.2
+BuildRequires: python3-sip-devel >= 4.10.3
 %endif # with_python3
 
 Requires: dbus-python
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 
 %description
@@ -57,44 +59,34 @@ These are Python bindings for Qt4.
 %package devel
 Summary: Files needed to build other bindings based on Qt4
 Group:	 Development/Languages
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt4-devel
 Requires: sip-devel
 %description devel
 Files needed to build other bindings for C++ classes that inherit from any
 of the Qt4 classes (e.g. KDE or your own).
 
-%if 0%{?with_python3}
-
 # The bindings are imported as "PyQt4", hence it's reasonable to name the
 # Python 3 subpackage "python3-PyQt4", despite the apparent tautology
-
 %package -n python3-PyQt4
 Summary: Python 3 bindings for Qt4
 Group:   Development/Languages
-
 # The dbus Python bindings have not yet been ported to Python 3:
 # Requires: dbus-python
-
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}}
-
 %description -n python3-PyQt4
 These are Python 3 bindings for Qt4.
 
 %package -n python3-PyQt4-devel
 Summary: Python 3 bindings for Qt4
 Group:   Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: python3-PyQt4-devel
+Requires: python3-PyQt4%{?_isa} = %{version}-%{release}
 Requires: python3-sip-devel
-
 %description -n python3-PyQt4-devel
 Files needed to build other Python 3 bindings for C++ classes that inherit
 from any of the Qt4 classes (e.g. KDE or your own).
 
-%endif # with_python3
-
 
 %prep
 %setup -q -n PyQt-x11-gpl-%{version}%{?snap:-snapshot-%{snap}}
@@ -231,6 +223,7 @@ rm -rf %{buildroot}
 %{_qt4_prefix}/qsci/api/python/PyQt4.api
 %endif
 
+%if 0%{?_with_python3}
 %files -n python3-PyQt4
 %defattr(-,root,root,-)
 %doc NEWS README
@@ -249,9 +242,13 @@ rm -rf %{buildroot}
 %if 0%{?fedora}
 %{_qt4_prefix}/qsci/api/python/PyQt4.api
 %endif
+%endif
 
 
 %changelog
+* Wed Jul 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.4-1
+- PyQt-x11-gpl-4.7.4
+
 * Sat May 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.3-3
 - BR: qt4-webkit-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	17 Apr 2010 20:45:48 -0000	1.20
+++ sources	14 Jul 2010 16:17:28 -0000	1.21
@@ -1 +1 @@
-42fdda73f07810abba002af8a939ee50  PyQt-x11-gpl-4.7.3.tar.gz
+88e9f1bc467cccf424d2032e3470982c  PyQt-x11-gpl-4.7.4.tar.gz