update: PyQt4, qscintilla, sip

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

P/PyQt4/PyQt4-vl.spec

@@ -9,7 +9,7 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.7.3
+Version: 4.7.4
 Release: 1%{?_dist_release}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
@@ -122,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 25 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.4-1
+- new upstream release
+- rebuilt with sip-4.10.5 and qt4-4.6.3
+
 * Sun May 09 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.3-1
 - new upstream release
 - updated Patch100

q/qscintilla/qscintilla-vl.spec

@@ -3,14 +3,19 @@
 
 %define ver 1.78
 
-%global qtdir	%(pkg-config --variable=prefix Qt)
-%global qtdata	%(pkg-config --variable=datadir Qt)
+%define qt4_ver 4.6.1
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
+%define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/lib)
+%define _qt4_includedir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/include)
+%define _qt4_translationdir %(pkg-config --variable translationdir --silence-errors Qt 2>/dev/null || echo %{_datadir}/qt4/translations)
+
+%global qtdir %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
 %global qtinc	%{qtdir}/include
 %global qtlib	%{qtdir}/lib
 
 Summary:	A Scintilla port to Qt
 Name:		qscintilla
-Version:	2.4.2
+Version:	2.4.4
 Release:	1%{?_dist_release}
 # matches up (pretty much) with qt4
 License:	GPLv3 or GPLv2 with exceptions
@@ -78,7 +83,7 @@ find src include -type f -exec chmod 0644 {} ';'
 sed -i 's/\r//' LICENSE.GPL2 GPL_EXCEPTION_ADDENDUM.TXT
 
 %build
-export QTDIR=`pkg-config --variable=prefix Qt`
+export QTDIR=%{_qt4_prefix}
 %ifarch x86_64
 export QMAKESPEC=$QTDIR/mkspecs/linux-g++-64/
 %else
@@ -120,22 +125,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(-, root, root, 755)
-%doc ChangeLog NEWS README
-%doc LICENSE.GPL3
-%doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
-%{qtlib}/lib*.so.*
-%{qtdir}/qsci/*
-## %{qtdir}/translations/*
-%{_datadir}/qt4/translations/*
+%doc NEWS README
+%doc LICENSE.GPL3 LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
+%{_qt4_libdir}/libqscintilla2.so.*
+%{_qt4_prefix}/qsci/*
+%{_qt4_translationdir}/*
 
 %files designer
 %defattr(-,root,root,-)
-%{qtdir}/plugins/designer/libqscintillaplugin.so
+%{_qt4_prefix}/plugins/designer/libqscintillaplugin.so
 
 %files devel
-%defattr(-, root, root, 755)
-%{qtinc}/*
-%{qtlib}/lib*.so
+%defattr(-, root, root, -)
+%{_qt4_includedir}/*
+%{_qt4_libdir}/libqscintilla2.so
 
 %files python
 %defattr(-,root,root,-)
@@ -146,6 +149,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sip/PyQt4/Qsci
 
 %changelog
+* Sun Jul 25 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.4.4-1
+- new upstream release
+- updated qt4 macros
+
 * Sat Feb 06 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.4.2-1
 - new upstream release
 

s/sip/sip-vl.spec

@@ -2,11 +2,12 @@
 %{!?python_inc:%global python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")}
 %define py_ver %(python -c 'import sys;print(sys.version[0:3])')
 
+Name:        sip
 Summary:     SIP - Python/C++ Bindings Generator
 Summary(ja): Python/C++ インターフェイス生成ツール
-Name:        sip
-Version:     4.10.2
+Version:     4.10.5
 Release:     1%{?_dist_release}
+
 License:     GPL
 Group:       Development/Tools
 URL:         http://www.riverbankcomputing.co.uk/software/sip/intro
@@ -91,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/sip
 
 %changelog
+* Sat Jul 24 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.10.5-1
+- new upstream release
+
 * Sun May 09 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.10.2-1
 - new upstream release