updated: PyQt4, sip

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@992 ec354946-7b23-47d6-9f5a-488ba84defc7

P/PyQt4/PyQt4-vl.spec

@@ -3,19 +3,14 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 %global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1 | cut -d- -f1)
 
-# ugly hack for Qt4 version auto-detection -- inagaki
-%define _qt4_notfound %(eval "pkg-config --exists Qt"; echo $?)
-%if %{_qt4_notfound}
-%define qtver 4.6.1
-%else
-%define qtver %(pkg-config --modversion QtCore)
-%endif
+# Qt4 version auto-detection -- inagaki
+%define qtver %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.6.1)
 %define qt4qmake %{_libdir}/qt-%{qtver}/bin/qmake
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.7
-Release: 2%{?_dist_release}
+Version: 4.7.3
+Release: 1%{?_dist_release}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -28,7 +23,7 @@ Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
 Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
 
 # Vine Patch
-Patch100: PyQt-x11-gpl-4.7-phononpath_vine.patch
+Patch100: PyQt-x11-gpl-4.7.3-phononpath_vine.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 #BuildRequires: chrpath
@@ -127,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 09 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.3-1
+- new upstream release
+- updated Patch100
+
 * Fri Feb 05 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7-2
 - updated Patch100 to build phonon module
 

s/sip/sip-vl.spec

@@ -5,7 +5,7 @@
 Summary:     SIP - Python/C++ Bindings Generator
 Summary(ja): Python/C++ インターフェイス生成ツール
 Name:        sip
-Version:     4.10
+Version:     4.10.2
 Release:     1%{?_dist_release}
 License:     GPL
 Group:       Development/Tools
@@ -13,7 +13,7 @@ URL:         http://www.riverbankcomputing.co.uk/software/sip/intro
 Source:      http://www.riverbankcomputing.co.uk/static/Downloads/sip4/%{name}-%{version}.tar.gz
 Patch0:      disable-rpaths.diff
 
-BuildRoot:		%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	python-devel
 BuildRequires:	sed
 
@@ -79,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, 755)
-%doc ChangeLog LICENSE LICENSE-GPL2.txt LICENSE-GPL3.txt NEWS README 
+%doc LICENSE LICENSE-GPL2 LICENSE-GPL3 NEWS README 
 %doc doc/html
 %{_bindir}/sip
 %{python_sitearch}/*
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/sip
 
 %changelog
+* Sun May 09 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.10.2-1
+- new upstream release
+
 * Wed Feb 03 2010 Shu KONNO <owa@bg.wakwak.com> 4.10-1
 - new upstream release