[PyQt4] - 4.8.3 snapshot - Little typo (#668289)

Rex Dieter rdieter at fedoraproject.org
Sat Jan 15 15:07:44 UTC 2011


commit ace475fa0de5f387dd279e5f7f15bb0ac242c654
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Jan 15 09:07:02 2011 -0600

    - 4.8.3 snapshot
    - Little typo (#668289)

 .gitignore                            |    1 +
 PyQt-x11-gpl-4.8-pyuic_shbang.patch   |    8 --------
 PyQt-x11-gpl-4.8.3-pyuic_shbang.patch |    8 ++++++++
 PyQt4.spec                            |   23 +++++++++++++++--------
 sources                               |    2 +-
 5 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2f7e3c9..748521e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /PyQt-x11-gpl-4.8.2.tar.gz
+/PyQt-x11-gpl-snapshot-4.8.3-454d07a16153.tar.gz
diff --git a/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch b/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch
new file mode 100644
index 0000000..58a64f6
--- /dev/null
+++ b/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch
@@ -0,0 +1,8 @@
+diff -up PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py.pyuic_shbang PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py
+--- PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py.pyuic_shbang	2011-01-14 21:44:29.000000000 -0600
++++ PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py	2011-01-15 08:56:58.371972273 -0600
+@@ -1,3 +1,4 @@
++#!/usr/bin/python -tt
+ #############################################################################
+ ##
+ ## Copyright (c) 2011 Riverbank Computing Limited <info at riverbankcomputing.com>
diff --git a/PyQt4.spec b/PyQt4.spec
index 9241452..f26fb90 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -5,20 +5,22 @@
 %global with_python3 1
 %endif
 
+%define snap 454d07a16153
+
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.8.2
-Release: 1%{?dist}
+Version: 4.8.3
+Release: 0.1.%{snap}%{?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}%{?snap:-snapshot-%{snap}}.tar.gz
+Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl%{?snap:-snapshot}-%{version}%{?snap:-%{snap}}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:  PyQt-x11-gpl-4.8.2-build_flags.patch
-Patch4:  PyQt-x11-gpl-4.8-pyuic_shbang.patch
+Patch4:  PyQt-x11-gpl-4.8.3-pyuic_shbang.patch
 # fix multilib conflict because of timestamp
 Patch5:  PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
 
@@ -39,11 +41,11 @@ 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.12
+BuildRequires: sip-devel >= 4.12.1
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel
-BuildRequires: python3-sip-devel >= 4.12
+BuildRequires: python3-sip-devel >= 4.12.1
 %endif # with_python3
 
 Requires: dbus-python
@@ -86,10 +88,10 @@ from any of the Qt4 classes (e.g. KDE or your own).
 
 
 %prep
-%setup -q -n PyQt-x11-gpl-%{version}%{?snap:-snapshot-%{snap}}
+%setup -q -n PyQt-x11-gpl%{?snap:-snapshot}-%{version}%{?snap:-%{snap}} 
 
 %patch1 -p1 -b .build_flags
-%patch4 -p1 
+%patch4 -p1
 %patch5 -p1 -b .timestamp
 
 ## permissions
@@ -102,6 +104,7 @@ rm -rf %{py3dir}
 cp -a . %{py3dir}
 %endif # with_python3
 
+
 %build
 
 QT4DIR=%{_qt4_prefix}
@@ -244,6 +247,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jan 15 2011 Rex Dieter <rdieter at fedoraproject.org> - 4.8.3-0.1.454d07a16153
+- 4.8.3 snapshot
+- Little typo (#668289)
+
 * Fri Dec 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.8.2-1
 - PyQt4-x11-gpl-4.8.2
 
diff --git a/sources b/sources
index dfc5794..8a005f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-142a32f126f205a2bd77f6a9910f5333  PyQt-x11-gpl-4.8.2.tar.gz
+4ea8237251901617fd63880bd7e6c479  PyQt-x11-gpl-snapshot-4.8.3-454d07a16153.tar.gz


More information about the scm-commits mailing list