rpms/PyQt4/F-8 pyuic4.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 PyQt4.spec, 1.1, 1.2

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19454

Modified Files:
	.cvsignore PyQt4.spec 
Added Files:
	pyuic4.sh 
Log Message:
* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-9
- multiarch conflicts in PyQt4 (#343001)



--- NEW FILE pyuic4.sh ---
#!/bin/sh

python_sitedir=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")

exec $python_sitedir/PyQt4/uic/pyuic.py ${1+"$@"}



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Oct 2007 21:01:00 -0000	1.2
+++ .cvsignore	30 Oct 2007 14:08:48 -0000	1.3
@@ -1 +1,2 @@
 PyQt-x11-gpl-4.2.tar.gz
+PyQt-x11-gpl-4.3.1.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/F-8/PyQt4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PyQt4.spec	4 Oct 2007 21:01:00 -0000	1.1
+++ PyQt4.spec	30 Oct 2007 14:08:48 -0000	1.2
@@ -4,7 +4,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPLv2
 Group: 	 Development/Languages
@@ -12,6 +12,8 @@
 Source0: http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source1: pyuic4.sh
+
 Patch1:  PyQt-x11-gpl-4.1.1-qconfig_h.patch
 Patch2:  PyQt-x11-gpl-4.2-64bit.patch
 
@@ -86,14 +88,9 @@
 # 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
+# fix multiarch conflict (#343001) 
+rm -f %{buildroot}%{_bindir}/pyuic4
+install -p -m755 -D %{SOURCE1} %{buildroot}%{_bindir}/pyuic4
 
 
 %clean
@@ -115,6 +112,9 @@
 
 
 %changelog
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-9
+- multiarch conflicts in PyQt4 (#343001)
+
 * Thu Oct 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2-8
 - drop ExcludeArch: ppc64 , qt4 bug is (hopefully) fixed.