updated: qt, qt4, PyQt4, avogadro, phonon, qca-ossl, qca2, qoauth, scim-bridge and uim

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

P/PyQt4/PyQt4-vl.spec

@@ -3,22 +3,23 @@
 %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)
 
-# Qt4 version auto-detection -- inagaki
-%define qtver %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.1)
-%define qt4qmake %{_libdir}/qt-%{qtver}/bin/qmake
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.2)
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
+%define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
+%define qt4qmake %{_qt4_prefix}/bin/qmake
 
 Name: 	 PyQt4
 Summary: Python bindings for Qt4
 Summary(ja): Qt4 の Python バインディング
 Version: 4.8.3
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 # 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}.tar.gz
-Patch1:  PyQt-x11-gpl-4.8.3-64bit.patch
+Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
 # HACK! FIXME: ping upstream why this isn't working right. -- Rex
 Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
 Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
@@ -30,17 +31,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 #BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
 BuildRequires: findutils
+BuildRequires: libXext-devel
 BuildRequires: phonon-devel
+BuildRequires: python-devel
 # beware of PyQt4/qscintilla bootstap issues
 #BuildRequires: qscintilla
 BuildRequires: qt4-devel >= 4.5.0
-BuildRequires: python-devel
 BuildRequires: sip-devel >= 4.9
-BuildRequires: libXext-devel
 Requires: sip >= %{sip_ver}
 Requires: dbus-python
-Requires: qt4 >= %{qtver}
-
+Requires: qt4
 
 %description
 These are Python bindings for Qt4.
@@ -49,7 +49,6 @@ These are Python bindings for Qt4.
 Summary: Files needed to build other bindings based on Qt4
 Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: qt4-devel >= %{qtver}
 Requires: sip-devel >= 4.9
 
 %description devel
@@ -59,9 +58,7 @@ of the Qt4 classes (e.g. KDE or your own).
 
 %prep
 %setup -q -n PyQt-x11-gpl-%{version}
-%ifarch x86_64
-%patch1 -p1 -b .64bit
-%endif
+#patch1 -p1 -b .64bit
 %patch2 -p1 -b .QT_SHARED
 #patch4 -p1 
 
@@ -110,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitearch}/PyQt4/uic/pyuic.py*
 # fixme?  -> sitearch?  -- Rex
 %{python_sitelib}/dbus/mainloop/qt.so
-%{_libdir}/qt-%{qtver}/plugins/designer/*
+%{_qt4_plugindir}/designer/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -123,8 +120,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sip/PyQt4/
 #{_qt4_prefix}/qsci/api/python/PyQt4.api
 
-
 %changelog
+* Thu Mar 10 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.3-3
+- rebuilt with qt4-4.7.2
+
 * Tue Feb 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.3-2
 - update Patch1 (PyQt-x11-gpl-4.8.3-64bit.patch)
 

a/avogadro/avogadro-vl.spec

@@ -1,4 +1,4 @@
-%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.1)
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.2)
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
 
 %define ENABLE_TESTS -DENABLE_TESTS:BOOL=ON
@@ -6,7 +6,7 @@
 Name:           avogadro
 Summary:        An advanced molecular editor for chemical purposes
 Version:        1.0.1
-Release:        7%{?_dist_release}
+Release:        8%{?_dist_release}
 
 Group:          Applications/Editors
 License:        GPLv2
@@ -21,8 +21,8 @@ Patch0:         avogadro-1.0.1-sip411.patch
 Patch1:         avogadro-1.0.1-pycapsule.patch
 
 BuildRequires:  cmake >= 2.6.0
-BuildRequires:  qt4-designer >= 4.5.1
 BuildRequires:  qt4-devel >= 4.5.1
+BuildRequires:  qt4-tools
 BuildRequires:  eigen2-devel >= 2.0.3
 BuildRequires:  openbabel-devel >= 2.2.2
 BuildRequires:  libboost-devel >= 1.35
@@ -30,7 +30,7 @@ BuildRequires:  libboost-python >= 1.35
 BuildRequires:  glew-devel >= 1.5.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-utils
-BuildRequires:  sip-devel
+BuildRequires:  sip-devel >= 4.11
 BuildRequires:  numpy
 
 Requires: %{name}-libs = %{version}-%{release}
@@ -143,6 +143,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/avogadro.desktop
 
 
 %changelog
+* Wed Mar  9 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-8
+- rebuilt with qt4-4.7.2
+- BR: qt4-tools instead of qt4-designer
+
 * Sun Feb 27 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-7
 - added BR: libboost-python
 - added R: glew-devel, eigen2-devel to devel package

p/phonon/phonon-vl.spec

@@ -1,4 +1,4 @@
-%define qt4_ver 4.7.1
+%define qt4_ver 4.7.2
 # Qt4 version auto-detection
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
@@ -10,7 +10,7 @@ Name: phonon
 Summary: Multimedia framework api
 Summary(ja): マルチメディアフレームワーク API
 Version: 4.4.4
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 Group: System Environment/Libraries
 License: LGPLv2+
@@ -49,7 +49,7 @@ Summary: Development files for phonon
 Summary(ja): phonon の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: qt4-devel
+Requires: qt4-devel = %{_qt4_version}
 
 %description devel
 Header files for developing applications using phonon
@@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/phonon-buildsystem/
 
 %changelog
+* Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.4-2
+- rebuilt with qt4-4.7.2
+
 * Sat Jan 29 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.4-1
 - new upstream release
 - rebuilt with qt4-4.7.1 on VineSeed

q/qca-ossl/qca-ossl-vl.spec

@@ -1,6 +1,6 @@
 %define beta 3
 
-%define qt4_ver 4.7.1
+%define qt4_ver 4.7.2
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
@@ -8,7 +8,7 @@
 Name:       qca-ossl
 Summary:    OpenSSL plugin for the Qt Cryptographic Architecture v2
 Version:    2.0.0
-Release:    0.beta%{beta}.12%{?_dist_release}
+Release:    0.beta%{beta}.13%{?_dist_release}
 
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.0.0-0.beta3.13
+- rebuilt with qt4-4.7.2
+
 * Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.0.0-0.beta3.12
 - built with qt4-4.7.1 for VineSeed
 - added Patch2 to build with oepnssl-1.0.0

q/qca2/qca2-vl.spec

@@ -1,11 +1,11 @@
-%define qt4_ver 4.7.1
+%define qt4_ver 4.7.2
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
 
 Name:           qca2
 Summary:        Qt Cryptographic Architecture
 Version:        2.0.3
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.0.3-2
+- rebuilt with qt-4.7.2
+
 * Sun Jan 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.0.3-1
 - new upstream release
 - built with qt-4.7.1

q/qoauth/qoauth-vl.spec

@@ -2,14 +2,14 @@
 %global gitdate 20100625
 #global posttag .%{?gitdate}git%{?githash}
 
-%define qt4_ver 4.6.1
+%define qt4_ver 4.7.2
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
 
 Name:		qoauth
 Summary:	Qt-based C++ library for OAuth authorization scheme
 Version:	1.0.1
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
@@ -30,7 +30,7 @@ OAuth authorization scheme.
 Summary:	Development files for the Qt OAuth support library
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	qt4-devel
+Requires:	qt4-devel = %{_qt4_version}
 Requires:	qca2-devel
 
 %description devel
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{_includedir}/*
 
 %changelog
+* Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-2
+- rebuilt with qt4-4.7.2
+
 * Thu Jan 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-2
 - Initial build for Vine Linux
 

q/qt/qt-vl.spec

@@ -1,6 +1,6 @@
 %define type x11
 %define qtdir %{_libdir}/qt-%{version}
-%define rel 8
+%define rel 9
 %define buildstatic 1
 %define buildnonthread 0
 %define styleplugins 0
@@ -18,6 +18,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 Summary: The shared library for the Qt GUI toolkit.
+Summary(ja): Qt ツールキット
 Name: qt
 Version: 3.3.8
 Release: %{rel}%{?_dist_release}
@@ -91,6 +92,7 @@ BuildRequires: unixODBC-devel
 
 %package devel
 Summary: Development files and documentation for the Qt GUI toolkit.
+Summary(ja): Qt ツールキットの開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: freetype2-devel
@@ -149,6 +151,7 @@ Requires: %{name}-devel = %{version}-%{release}
 
 %package designer
 Summary: Interface designer (IDE) for the Qt toolkit
+Summary(ja): Qt ツールキットのインターフェースデザイナ
 Group: Applications/Development
 Requires: %{name}-devel = %{version}-%{release}
 Requires(post):   alternatives
@@ -521,48 +524,69 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %post devel
-%{_syssbindir}/update-alternatives --install \
-        %{_bindir}/qtconfig qtconfig %{qtdir}/bin/qtconfig 10 \
-        --slave %{_bindir}/assistant \
-                assistant \
-                %{qtdir}/bin/assistant \
-        --slave %{_bindir}/moc \
-                moc \
-                %{qtdir}/bin/moc \
-        --slave %{_bindir}/qmake \
-                qmake \
-                %{qtdir}/bin/qmake \
-        --slave %{_bindir}/uic \
-                uic \
-                %{qtdir}/bin/uic \
-        --slave %{_bindir}/uic3 \
-                uic3 \
-                %{qtdir}/bin/uic3
+/sbin/update-alternatives --install \
+    %{_bindir}/assistant assistant %{qtdir}/bin/assistant 10 
+/sbin/update-alternatives --install \
+    %{_bindir}/qtconfig qtconfig %{qtdir}/bin/qtconfig 10 
+/sbin/update-alternatives --install \
+    %{_bindir}/qmake qmake %{qtdir}/bin/qmake 10 \
+    --slave %{_bindir}/moc \
+        moc \
+        %{qtdir}/bin/moc \
+    --slave %{_bindir}/uic \
+        uic \
+        %{qtdir}/bin/uic \
+    --slave %{_bindir}/lrelease \
+        lrelease \
+        %{qtdir}/bin/lrelease \
+    --slave %{_bindir}/lupdate \
+        lupdate \
+        %{qtdir}/bin/lupdate
+
+%posttrans devel
+# fix broken symlink if it's there
+if [ ! -f %{_bindir}/assistant ] ; then
+    /sbin/update-alternatives --auto assistant
+fi
+if [ ! -f %{_bindir}/qtconfig ] ; then
+    /sbin/update-alternatives --auto qtconfig
+fi
+if [ ! -f %{_bindir}/qmake ] ; then
+    /sbin/update-alternatives --auto qmake
+fi
 
 %postun devel
-[ "$1" = "1" ] && exit
-%{_syssbindir}/update-alternatives --remove qtconfig %{qtdir}/bin/qtconfig
-[ -f "%{_bindir}/qtconfig" ] || %{_syssbindir}/update-alternatives \
---auto qtconfig
+if [ $1 -eq 0 ] ; then
+    /sbin/update-alternatives --remove assistant %{qtdir}/bin/assistant
+    /sbin/update-alternatives --remove qtconfig %{_qtdir}/bin/qtconfig
+    /sbin/update-alternatives --remove qmake %{_qtdir}/bin/qmake
+    /sbin/update-alternatives --auto assistant
+    /sbin/update-alternatives --auto qtconfig
+    /sbin/update-alternatives --auto qmake
+fi
 
 %post designer
-%{_syssbindir}/update-alternatives --install \
-        %{_bindir}/designer designer %{qtdir}/bin/designer 10 \
-        --slave %{_bindir}/linguist \
-                linguist \
-                %{qtdir}/bin/linguist \
-        --slave %{_bindir}/lrelease \
-                lrelease \
-                %{qtdir}/bin/lrelease \
-        --slave %{_bindir}/lupdate \
-                lupdate \
-                %{qtdir}/bin/lupdate
+/sbin/update-alternatives --install \
+    %{_bindir}/designer designer %{qtdir}/bin/designer 10 
+/sbin/update-alternatives --install \
+    %{_bindir}/linguist linguist %{qtdir}/bin/linguist 10 
+
+%posttrans designer
+# fix broken symlink if it's there
+if [ ! -f %{_bindir}/designer ] ; then
+    /sbin/update-alternatives --auto designer
+fi
+if [ ! -f %{_bindir}/linguist ] ; then
+    /sbin/update-alternatives --auto linguist
+fi
 
 %postun designer
-[ "$1" = "1" ] && exit
-%{_syssbindir}/update-alternatives --remove designer %{qtdir}/bin/desiner
-[ -f "%{_bindir}/designer" ] || %{_syssbindir}/update-alternatives \
---auto designer
+if [ $1 -eq 0 ] ; then
+    /sbin/update-alternatives --remove designer %{qtdir}/bin/designer
+    /sbin/update-alternatives --remove linguist %{_qtdir}/bin/linguist
+    /sbin/update-alternatives --auto designer
+    /sbin/update-alternatives --auto linguist
+fi
 
 %post -n compat32-%{name} -p /sbin/ldconfig
 
@@ -594,6 +618,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %config /etc/profile.d/*
 %{qtdir}/bin/assistant
 %{qtdir}/bin/findtr
+%{qtdir}/bin/lrelease
+%{qtdir}/bin/lupdate
 %{qtdir}/bin/moc
 %{qtdir}/bin/qm2ts
 %{qtdir}/bin/qmake
@@ -612,6 +638,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 %{_bindir}/assistant*
 %{_bindir}/findtr*
+%{_bindir}/lrelease*
+%{_bindir}/lupdate*
 %{_bindir}/moc*
 %{_bindir}/qm2ts*
 %{_bindir}/qmake*
@@ -664,14 +692,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/designer*
 %{_bindir}/linguist*
-%{_bindir}/lrelease*
-%{_bindir}/lupdate*
 %dir %{qtdir}/plugins/designer
 %{qtdir}/plugins/designer/*
 %{qtdir}/bin/designer
 %{qtdir}/bin/linguist
-%{qtdir}/bin/lrelease
-%{qtdir}/bin/lupdate
 %config /etc/X11/applnk/Development/designer.desktop
 
 # compat32
@@ -719,6 +743,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.8-9
+- updated %%post. %%posttrans and %%postun section
+
 * Mon Sep 27 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.8-8
 - rebuilt with rpm-4.8.1 for pkg-config
 

q/qt4/qt4-vl.spec

@@ -25,13 +25,16 @@
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
+# enable kde-qt integration/patches 
+%define kde_qt 1
+
 # See http://bugzilla.redhat.com/223663
 %define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
 
 Summary: Qt toolkit
 Summary(ja): Qt ツールキット
 Name: qt4
-Version: 4.7.1
+Version: 4.7.2
 Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@@ -45,18 +48,12 @@ Source4: Trolltech.conf
 # header file to workaround multilib issue
 Source5: qconfig-multilib.h
 
-# gstreamer logos
-Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
-Source11: hi16-phonon-gstreamer.png
-Source12: hi22-phonon-gstreamer.png
-Source13: hi32-phonon-gstreamer.png
-Source14: hi48-phonon-gstreamer.png
-Source15: hi64-phonon-gstreamer.png
-Source16: hi128-phonon-gstreamer.png
-
 # desktop files
-Source21: designer.desktop
-Source22: linguist.desktop
+Source20: assistant.desktop.vine
+Source21: designer.desktop.vine
+Source22: linguist.desktop.vine
+Source23: qtdemo.desktop.vine
+Source24: qtconfig.desktop.vine
 
 # upstream qt4-logo, http://trolltech.com/images/products/qt/qt4-logo
 Source30: hi128-app-qt4-logo.png
@@ -83,7 +80,7 @@ Patch19: qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
 Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
 
 # remove dependency of webkit in assistant
-Patch24: qt-everywhere-opensource-src-4.7.1-webkit.patch
+Patch24: qt-everywhere-opensource-src-4.7.1-assistant_no_webkit.patch
 
 ## upstreamable bits
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
@@ -118,22 +115,12 @@ Patch64: qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch
 Patch65: qt-everywhere-opensource-src-4.7.1-qtreeview-kpackagekit-crash.patch
 
 # upstream patches
-# Reordering of Malayalam Rakar not working properly
-Patch100: qt-everywhere-opensource-src-4.7.1-ml_IN-bz528303.patch
-
-# fix QTextCursor crash in Lokalize and Psi (QTBUG-15857, kde#249373, #660028)
-# http://qt.gitorious.org/qt/qt/commit/6ae84f1183e91c910ca92a55e37f8254ace805c0
-Patch101: qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch
-# followup for regressions
-# http://qt.gitorious.org/qt/qt/commit/34c297faca93e1286573b2a01127e4e7af00aff2.patch
-Patch102: qt-everywhere-opensource-4.7.1-QTBUG-15857-2.patch
-
-# qsortfilterproxymodel merge, http://qt.gitorious.org/qt/qt/merge_requests/934
-Patch103: qt-everywhere-opensource-src-4.7.1-qsortfilterproxymodel_merge934.patch
+# adds debug support to webkit/JavaScriptCore
+# UPSTREAM ME
+Patch105: qt-everywhere-opensource-src-4.7.1-webkit_debug_javascriptcore.patch
 
 # kde-qt git patches
 Patch202: 0002-This-patch-makes-override-redirect-windows-popup-men.patch
-Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
 Patch205: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
 Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
 
@@ -142,33 +129,33 @@ Patch300: qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch
 
 # Vine Patches
 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
-Patch1022: qt-x11-opensource-src-4.7.1-system_ca_certificates_vine.patch 
+Patch1022: qt-everywhere-opensource-src-4.7.2-system_ca_certificates_vine.patch 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-%if %{?_dist_release} == "vl4"
-BuildRequires: gcc4 gcc4-c++ XOrg-devel XOrg-gl-devel
-%else
-# Vine Linux 5+
-BuildRequires: fontconfig-devel 
-BuildRequires: libICE-devel libSM-devel libXcursor-devel 
-BuildRequires: libXext-devel libXfixes-devel libXft-devel
-BuildRequires: libXi-devel libXinerama-devel libXrandr-devel
-BuildRequires: libXrender-devel libXt-devel libX11-devel
-BuildRequires: libxkbfile-devel xorg-x11-proto-devel
-BuildRequires: mesa-libGL-devel mesa-libGLU-devel
-BuildRequires: WebKit-gtk-devel
-%endif
-BuildRequires: glib2-devel gtk2-devel
-BuildRequires: libpng-devel >= 1.2.5
-BuildRequires: libmng-devel libtiff-devel libjpeg-devel freetype2-devel
-BuildRequires: zlib-devel libungif-devel openssl-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: cups-devel >= 1.1.9
 BuildRequires: dbus-devel >= 0.62
 BuildRequires: desktop-file-utils
-%if %{phonon}
-BuildRequires: gstreamer-devel gstreamer-plugins-base-devel
-%endif
+BuildRequires: findutils
+BuildRequires: fontconfig-devel
+BuildRequires: glib2-devel
+# -gtk-style
+BuildRequires: gtk2-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libmng-devel
+BuildRequires: libpng-devel >= 1.2.5
+BuildRequires: libtiff-devel
+BuildRequires: NetworkManager-devel
+BuildRequires: openssl-devel
+BuildRequires: pkgconfig
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: WebKit-gtk-devel
+BuildRequires: zlib-devel
+
+# X11 dependencies
+%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libXv-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
+BuildRequires: %{x_deps}
+
 %if %{MySQL}
 BuildRequires: MySQL-devel
 %endif
@@ -186,9 +173,10 @@ BuildRequires: sqlite3-devel
 Requires: libexpat
 Requires: libpng >= 1.2.5
 
-%if %{?_dist_release} != "vl4"
 Provides: WebKit-qt
-%endif
+
+Obsoletes: qgtkstyle < 0.1
+Provides:  qgtkstyle = 0.1-1
 
 %description
 Qt is a GUI software toolkit which simplifies the task of writing and
@@ -200,38 +188,48 @@ Qt is written in C++ and is fully object-oriented.
 This package contains the shared library needed to run qt
 applications, as well as the README files for qt.
 
+
+%package config
+Summary: Graphical configuration tool for programs using Qt 4 
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires(post): alternatives
+Requires(postun): alternatives
+
+%description config 
+%{summary}.
+
+
 %package designer
 Summary: Interface designer (IDE) for the Qt toolkit
+Summary(ja): Qt ツールキットのインターフェースデザイナ
 Group: Applications/Development
 Requires: %{name}-devel = %{version}-%{release}
-Requires(post):   alternatives
+Requires(post): alternatives
 Requires(postun): alternatives
 
 %description designer
 The qt-designer package contains an User Interface designer tool
 for the Qt toolkit.
 
+
 %package devel
 Summary: Development files for the Qt GUI toolkit.
 Summary(ja): Qt ツールキットの開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libICE-devel libSM-devel libXcursor-devel 
-Requires: libXext-devel libXfixes-devel libXft-devel
-Requires: libXi-devel libXinerama-devel libXrandr-devel
-Requires: libXrender-devel libXt-devel libX11-devel
-Requires: libxkbfile-devel xorg-x11-proto-devel
-Requires: mesa-libGL-devel mesa-libGLU-devel
+Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
-Requires(post):   alternatives
+Requires: pkgconfig
+Requires(post): alternatives
 Requires(postun): alternatives
-Provides: WebKit-qt-devel
+Provides:  WebKit-qt-devel
 
 %description devel
 This package contains the files necessary to develop
-applications using the Qt toolkit.  Includes:
-Qt Linguist
+applications using the Qt toolkit.
+
 
 %package doc
 Summary: API documentation for Qt4
@@ -243,17 +241,21 @@ Requires: %{name} = %{version}-%{release}
 %{summary}.
 
 %description doc -l ja
-%{summary}.
+Qt4 の API ドキュメントです．
 
 
-%package -n phonon-backend-gstreamer
-Summary: Gstreamer phonon backend
-Group:   Applications/Multimedia
-Requires: phonon >= 4.3.1 
-#Provides: phonon-backend = 4.3.1-100%{?_dist_release}
+%package tools
+Summary: Qt 4 development tools
+Summary(ja): Qt 4 開発ツール集
+Group: Development/Tools
+Requires: %{name}-devel  = %{version}-%{release}
+Requires: %{name}-sqlite = %{version}-%{release}
+Requires(post): alternatives
+Requires(postun): alternatives
+
+%description tools
+This package contains tools used to assist in Qt 4 development.
 
-%description -n phonon-backend-gstreamer
-%{summary}.
 
 %package MySQL
 Summary: MySQL drivers for Qt's SQL classes.
@@ -289,7 +291,8 @@ SQLite driver for Qt's SQL classes (QSQL)
 
 # compat32
 %package -n compat32-%{name}
-Summary: The shared library for the Qt GUI toolkit.
+Summary: Qt toolkit
+Summary(ja): Qt ツールキット
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -305,21 +308,15 @@ applications, as well as the README files for qt.
 
 %package -n compat32-%{name}-devel
 Summary: Development files and documentation for the Qt GUI toolkit.
+Summary(ja): Qt ツールキットの開発用ファイル
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-devel
-The qt-devel package contains the files necessary to develop
-applications using the Qt GUI toolkit: the header files, the Qt meta
-object compiler, the man pages, the HTML documentation and example
-programs. See http://www.trolltech.com/products/qt.html for more
-information about Qt, or look at
-/usr/share/doc/qt-devel-%{version}/html/index.html, which provides Qt
-documentation in HTML format.
+This package contains the files necessary to develop
+applications using the Qt toolkit.
 
-Install qt-devel if you want to develop GUI applications using the Qt
-toolkit.
 
 %prep
 %setup -q -n qt-everywhere-opensource-src-%{version}
@@ -328,7 +325,8 @@ toolkit.
 #patch16 -p1 -b .kde4_plugins
 %patch19 -p1 -b .phonon_servicesfile
 %patch23 -p1 -b .glib_eventloop_nullcheck
-%patch24 -p1 -b .webkit
+## make -assistant subpkg instead (#660287#9)
+#patch24 -p1 -b .assistant_no_webkit
 ## TODO: still worth carrying?  if so, upstream it.
 %patch53 -p1 -b .qatomic-inline-asm
 ## TODO: upstream me
@@ -345,15 +343,11 @@ toolkit.
 %patch65 -p1 -b .qtreeview-kpackagekit-crash
 
 # upstream patches
-%patch100 -p1 -b .ml_IN-rendering
-%patch101 -p1 -b .qtextcursor-crash
-%patch102 -p1 -b .QTBUG-15857-2
-%patch103 -p1 -b .qsortfilterproxymodel_merge934
+%patch105 -p1 -b .webkit_debug_javascriptcore
 
 # kde-qt branch
 %if 0%{?kde_qt}
 %patch202 -p1 -b .kde-qt-0002
-%patch204 -p1 -b .kde-qt-0004
 %patch205 -p1 -b .kde-qt-0005
 %patch212 -p1 -b .kde-qt-0012
 %endif
@@ -362,7 +356,7 @@ toolkit.
 %patch300 -p1 -b .CVE-2010-1822-crash-svg-image
 
 # Patches for Vine
-%patch1022 -p1 -b .system_ca_certificates
+%patch1022 -p0 -b .system_ca_certificates
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -408,6 +402,13 @@ for f in translations/*.ts ; do
     touch ${f%.ts}.qm
 done
 
+# desktop menu
+sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE20} > assistant.desktop
+sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE21} > designer.desktop
+sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE22} > linguist.desktop
+sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE23} > qtdemo.desktop
+sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE24} > qtconfig.desktop
+
 %build
 # build shared, threaded (default) libraries
 ./configure -v \
@@ -436,12 +437,7 @@ done
   -no-rpath \
   -reduce-relocations \
   -no-separate-debug-info \
-%if %{phonon}
-  -phonon \
-  -phonon-backend \
-%else
   -no-phonon \
-%endif
   -pch \
   -no-javascript-jit \
   -sm \
@@ -500,17 +496,43 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --vendor="" \
-  %{SOURCE21} %{SOURCE22}
+  assistant.desktop designer.desktop linguist.desktop qtconfig.desktop
+
+## pkg-config
+# strip extraneous dirs/libraries 
+# safe ones
+glib2_libs=$(pkg-config --libs glib-2.0 gobject-2.0 gthread-2.0)
+ssl_libs=$(pkg-config --libs openssl)
+for dep in \
+  -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} \
+  -ljpeg -lm -lmng -lpng -lpulse -lpulse-mainloop-glib ${ssl_libs} -lsqlite3 -lz \
+  -L/usr/X11R6/lib -L/usr/X11R6/%{_lib} -L%{_libdir} ; do
+  sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la 
+#  sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc
+  sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl
+done
+# riskier
+for dep in -ldl -lphonon -lpthread -lICE -lSM -lX11 -lXcursor -lXext -lXfixes -lXft -lXinerama -lXi -lXrandr -lXrender -lXt ; do
+  sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la 
+#  sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc 
+  sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl
+done
 
 # nuke dangling reference(s) to %buildroot
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" $RPM_BUILD_ROOT%{_qt4_libdir}/*.prl
-
-# nuke QMAKE_PRL_LIBS, seems similar to static linking and .la files (#520323)
-sed -i -e "s|^QMAKE_PRL_LIBS|#QMAKE_PRL_LIBS|" $RPM_BUILD_ROOT%{_qt4_libdir}/*.prl
+sed -i -e "s|-L%{_builddir}/qt-everywhere-opensource-src-%{version}/lib||g" \
+  $RPM_BUILD_ROOT%{_qt4_libdir}/pkgconfig/*.pc \
+  $RPM_BUILD_ROOT%{_qt4_libdir}/*.prl
 
 # .la files, die, die, die.
 rm -f $RPM_BUILD_ROOT%{_qt4_libdir}/lib*.la
 
+# let rpm handle binaries conflicts
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+for i in $RPM_BUILD_ROOT%{_qt4_bindir}/*; do
+	ln -s ../%{_lib}/qt-%{version}/bin/`basename $i` $RPM_BUILD_ROOT/%{_bindir}
+done
+
 %ifarch %{multilib_archs}
 # multilib: qconfig.h
   mv $RPM_BUILD_ROOT%{_qt4_headerdir}/Qt/qconfig.h $RPM_BUILD_ROOT%{_qt4_headerdir}/QtCore/qconfig-%{_arch}.h
@@ -543,50 +565,24 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64,128x1
 install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
 install -p -m644 -D %{SOURCE31} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
 
+# assistant icons
+install -p -m644 -D tools/assistant/tools/assistant/images/assistant.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/assistant.png
+install -p -m644 -D tools/assistant/tools/assistant/images/assistant-128.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/assistant.png
 # designer icons
-install -p -m644 -D tools/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer.png
+install -p -m644 -D tools/designer/src/designer/images/designer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/designer.png
 # linguist icons
 for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
   size=$(echo $(basename ${icon}) | cut -d- -f2)
   install -p -m644 -D ${icon} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png
 done
 
-
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-cat > $RPM_BUILD_ROOT/etc/profile.d/qt4.sh <<EOF
-# Qt initialization script (sh)
-if [ -z "\$QTDIR" ] ; then
-	QTDIR="%{_qt4_libdir}"
-fi
-export QTDIR
-EOF
-
-chmod 755 $RPM_BUILD_ROOT/etc/profile.d/qt4.sh
-
-cat > $RPM_BUILD_ROOT/etc/profile.d/qt4.csh <<EOF
-# Qt initialization script (csh)
-if ( \$?QTDIR ) then
-         exit
-endif
-setenv QTDIR %{_qt4_libdir}
-EOF
-
-chmod 755 $RPM_BUILD_ROOT/etc/profile.d/qt4.csh
-
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-for i in $RPM_BUILD_ROOT%{_qt4_bindir}/*; do
-	#ln -s ../lib/qt-%{version}/bin/`basename $i` $RPM_BUILD_ROOT/%{_bindir}
-	ln -s ../%{_lib}/qt-%{version}/bin/`basename $i` $RPM_BUILD_ROOT/%{_bindir}
-done
-
-
 # pkg-config files
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 cp $RPM_BUILD_ROOT%{_qt4_libdir}/pkgconfig/*.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 rm -rf $RPM_BUILD_ROOT%{_qt4_libdir}/pkgconfig
 
 # Qt.pc
-cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc<<EOF
+cat > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/Qt.pc << EOF
 prefix=%{_qt4_prefix}
 bindir=%{_qt4_bindir}
 datadir=%{_qt4_datadir}
@@ -596,6 +592,7 @@ examplesdir=%{_qt4_examplesdir}
 headerdir=%{_qt4_headerdir}
 importdir=%{_qt4_importdir}
 libdir=%{_qt4_libdir}
+moc=%{_qt4_bindir}/moc
 plugindir=%{_qt4_plugindir}
 qmake=%{_qt4_bindir}/qmake
 sysconfdir=%{_qt4_sysconfdir}
@@ -606,58 +603,66 @@ Description: Qt Configuration
 Version: %{version}
 EOF
 
-# create/own stuff under %%_qt4_plugindir
-mkdir %{buildroot}%{_qt4_plugindir}/crypto
-mkdir %{buildroot}%{_qt4_plugindir}/gui_platform
-mkdir %{buildroot}%{_qt4_plugindir}/styles
-
-%if %{phonon}
-# remove for phonon 4.3.1
-rm -fv  $RPM_BUILD_ROOT%{qtdir}/lib/libphonon.so*
-rm -rfv $RPM_BUILD_ROOT%{_libdir}/pkgconfig/phonon.pc
-# contents slightly different between phonon-4.3.1 and qt-4.5.0
-rm -fv  $RPM_BUILD_ROOT%{_includedir}/phonon/phononnamespace.h
-# contents dup'd but should remove just in case
-rm -fv  $RPM_BUILD_ROOT%{_includedir}/phonon/*.h
-rm -rfv $RPM_BUILD_ROOT%{qtdir}/include/phonon*
-#rm -rfv %{buildroot}%{_qt4_headerdir}/Qt/phonon*
-rm -fv $RPM_BUILD_ROOT%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-rm -fv $RPM_BUILD_ROOT%{qtdir}/lib/libphonon.prl
-
-install -D -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
-install -D -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/phonon-gstreamer.png
-install -D -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps/phonon-gstreamer.png
-install -D -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/phonon-gstreamer.png
-install -D -m 0644 %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/phonon-gstreamer.png
-install -D -m 0644 %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/phonon-gstreamer.png
-install -D -m 0644 %{SOURCE16} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/phonon-gstreamer.png
-%endif
+# rpm macros
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.qt4 << EOF
+%%_qt4 %{name}
+%%_qt47 %{version}
+%%_qt4_version %{version}
+%%_qt4_prefix %%{_libdir}/qt-%{version}
+%%_qt4_bindir %%{_qt4_prefix}/bin
+%%_qt4_datadir %%{_qt4_prefix}
+%%_qt4_demosdir %%{_qt4_prefix}/demos
+%%_qt4_docdir %%{_docdir}/qt4
+%%_qt4_examples %%{_qt4_prefix}/examples
+%%_qt4_headerdir %%{_includedir}
+%%_qt4_importdir %%{_qt4_prefix}/imports
+%%_qt4_libdir %%{_libdir}
+%%_qt4_plugindir %%{_qt4_prefix}/plugins
+%%_qt4_qmake %%{_qt4_bindir}/qmake
+%%_qt4_sysconfdir %%{_sysconfdir}
+%%_qt4_translationdir %%{_datadir}/qt4/translations 
+EOF
 
-# make symbolic link to qt docdir
-#if echo %{_docdir} | grep  share >& /dev/null ; then
-#  ln -s  ../../share/doc/%{name}-devel-%{version} $RPM_BUILD_ROOT%{_qt4_docdir}
-#else
-#  ln -s  ../../doc/%{name}-devel-%{version} $RPM_BUILD_ROOT%{_qt4_docdir}
-#fi
+# /etc/prodile.d 
+mkdir -p $RPM_BUILD_ROOT/etc/profile.d
+cat > $RPM_BUILD_ROOT/etc/profile.d/qt4.sh <<EOF
+# Qt initialization script (sh)
+if [ -z "\$QTDIR" ] ; then
+	QTDIR="%{_qt4_libdir}"
+fi
+export QTDIR
+EOF
 
-# clean up
-cd $RPM_BUILD_ROOT%{qtdir}
-#rm -f lib/*.la
-#rm -f lib/*.prl
-rm -f `find ../../ -name *.debug`
+cat > $RPM_BUILD_ROOT/etc/profile.d/qt4.csh <<EOF
+# Qt initialization script (csh)
+if ( \$?QTDIR ) then
+         exit
+endif
+setenv QTDIR %{_qt4_libdir}
+EOF
+
+chmod 755 $RPM_BUILD_ROOT/etc/profile.d/qt4.sh
+chmod 755 $RPM_BUILD_ROOT/etc/profile.d/qt4.csh
+
+# create/own stuff under %%_qt4_plugindir
+mkdir $RPM_BUILD_ROOT%{_qt4_plugindir}/crypto
+mkdir $RPM_BUILD_ROOT%{_qt4_plugindir}/gui_platform
+mkdir $RPM_BUILD_ROOT%{_qt4_plugindir}/styles
 
+# remove qvfb translations, we don't ship qvfb
+rm -fv  $RPM_BUILD_ROOT%{_qt4_translationdir}/qvfb_*.qm
 
 # delete files to use alternatives
 rm -f $RPM_BUILD_ROOT%{_bindir}/assistant
-rm -f $RPM_BUILD_ROOT%{_bindir}/moc
-rm -f $RPM_BUILD_ROOT%{_bindir}/qmake
-rm -f $RPM_BUILD_ROOT%{_bindir}/qtconfig
-rm -f $RPM_BUILD_ROOT%{_bindir}/uic
-rm -f $RPM_BUILD_ROOT%{_bindir}/uic3
 rm -f $RPM_BUILD_ROOT%{_bindir}/designer
 rm -f $RPM_BUILD_ROOT%{_bindir}/linguist
 rm -f $RPM_BUILD_ROOT%{_bindir}/lrelease
 rm -f $RPM_BUILD_ROOT%{_bindir}/lupdate
+rm -f $RPM_BUILD_ROOT%{_bindir}/moc
+rm -f $RPM_BUILD_ROOT%{_bindir}/qmake
+rm -f $RPM_BUILD_ROOT%{_bindir}/qtconfig
+rm -f $RPM_BUILD_ROOT%{_bindir}/uic
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -672,92 +677,110 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
-  touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
 fi
 
-# devel
-%post devel
-%{_syssbindir}/update-alternatives --install \
-        %{_bindir}/qtconfig qtconfig %{_qt4_bindir}/qtconfig 20 \
-        --slave %{_bindir}/assistant \
-                assistant \
-                %{_qt4_bindir}/assistant \
-        --slave %{_bindir}/moc \
-                moc \
-                %{_qt4_bindir}/moc \
-        --slave %{_bindir}/qmake \
-                qmake \
-                %{_qt4_bindir}/qmake \
-        --slave %{_bindir}/uic \
-                uic \
-                %{_qt4_bindir}/uic \
-        --slave %{_bindir}/uic3 \
-                uic3 \
-                %{_qt4_bindir}/uic3 \
+# config
+%post config
+/sbin/update-alternatives --install \
+    %{_bindir}/qtconfig qtconfig %{_qt4_bindir}/qtconfig 20
 
+%posttrans config
+# fix broken symlink if it's there
 if [ ! -f %{_bindir}/qtconfig ] ; then
     /sbin/update-alternatives --auto qtconfig
 fi
 
-
-%postun devel
+%postun config
 if [ $1 -eq 0 ] ; then
     /sbin/update-alternatives --remove qtconfig %{_qt4_bindir}/qtconfig
     /sbin/update-alternatives --auto qtconfig
 fi
 
-# phonon-backend-gstreamer
-%if %{phonon}
-%post -n phonon-backend-gstreamer
+# designer
+%post designer
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+/sbin/update-alternatives --install \
+    %{_bindir}/designer designer %{_qt4_bindir}/designer 20
 
-%posttrans -n phonon-backend-gstreamer
+%posttrans designer
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+# fix broken symlink if it's there
+if [ ! -f %{_bindir}/designer ] ; then
+    /sbin/update-alternatives --auto designer
+fi
 
-%postun -n phonon-backend-gstreamer
+%postun designer
 if [ $1 -eq 0 ] ; then
-  touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+    /sbin/update-alternatives --remove designer %{_qt4_bindir}/desiner
+    /sbin/update-alternatives --auto designer
 fi
-%endif
 
-# qt4-designer
-%post designer
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
-%{_syssbindir}/update-alternatives --install \
-        %{_bindir}/designer designer %{_qt4_bindir}/designer 20 \
-        --slave %{_bindir}/linguist \
-                linguist \
-                %{_qt4_bindir}/linguist \
-        --slave %{_bindir}/lrelease \
-                lrelease \
-                %{_qt4_bindir}/lrelease \
-        --slave %{_bindir}/lupdate \
-                lupdate \
-                %{_qt4_bindir}/lupdate
-
-[ -f "%{_bindir}/designer" ] || %{_syssbindir}/update-alternatives --auto designer
 
-%posttrans designer
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+# devel
+%post devel
+/sbin/update-alternatives --install \
+    %{_bindir}/qmake qmake %{_qt4_bindir}/qmake 20 \
+    --slave %{_bindir}/moc \
+        moc \
+        %{_qt4_bindir}/moc \
+    --slave %{_bindir}/uic \
+        uic \
+        %{_qt4_bindir}/uic \
+    --slave %{_bindir}/lrelease \
+        lrelease \
+        %{_qt4_bindir}/lrelease \
+    --slave %{_bindir}/lupdate \
+        lupdate \
+        %{_qt4_bindir}/lupdate
+
+%posttrans devel
+# fix broken symlink if it's there
+if [ ! -f %{_bindir}/qmake ] ; then
+    /sbin/update-alternatives --auto qmake
+fi
 
-%postun designer
+%postun devel
 if [ $1 -eq 0 ] ; then
-  touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
-  %{_syssbindir}/update-alternatives --remove designer %{_qt4_bindir}/desiner
-  [ -f "%{_bindir}/designer" ] || %{_syssbindir}/update-alternatives --auto designer
+    /sbin/update-alternatives --remove qmake %{_qt4_bindir}/qmake
+    /sbin/update-alternatives --auto qmake
 fi
 
+%post tools
+/sbin/update-alternatives --install \
+    %{_bindir}/assistant assistant %{_qt4_bindir}/assistant 20 
+/sbin/update-alternatives --install \
+    %{_bindir}/linguist  linguist  %{_qt4_bindir}/linguist 20
+
+%posttrans tools
+# fix broken symlink if it's there
+if [ ! -f %{_bindir}/assistant ] ; then
+    /sbin/update-alternatives --auto assistant
+fi
+if [ ! -f %{_bindir}/linguist ] ; then
+    /sbin/update-alternatives --auto linguist
+fi
+
+%postun tools
+if [ $1 -eq 0 ] ; then
+    /sbin/update-alternatives --remove assistant %{_qt4_bindir}/assistant
+    /sbin/update-alternatives --remove linguist %{_qt4_bindir}/linguist
+    /sbin/update-alternatives --auto assistant
+    /sbin/update-alternatives --auto linguist
+fi
+
+
 %post -n compat32-%{name} -p /sbin/ldconfig
 
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-#doc README README.kde-qt LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
 %doc README LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
+%{_sysconfdir}/rpm/macros.*
 %config(noreplace) %{_sysconfdir}/Trolltech.conf
 %if "%{_qt4_libdir}" != "%{_libdir}"
 %config %{_sysconfdir}/ld.so.conf.d/qt4.conf
@@ -789,37 +812,46 @@ fi
 %{_qt4_plugindir}/imageformats/*
 %dir %{_qt4_plugindir}/inputmethods
 %{_qt4_plugindir}/inputmethods/*
+%dir %{_qt4_plugindir}/qmltooling
+%{_qt4_plugindir}/qmltooling/*
 %dir %{_qt4_plugindir}/script
 %{_qt4_plugindir}/script/*
 %dir %{_qt4_translationdir}
 %{_qt4_translationdir}/*
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
+%files config
+%defattr(-,root,root,-)
+%{_qt4_bindir}/qtconfig
+%{_datadir}/applications/qtconfig.desktop
+
 %files designer
 %defattr(-,root,root,-)
 %{_qt4_bindir}/designer
-%{_qt4_bindir}/linguist
-%{_qt4_bindir}/lrelease
-%{_qt4_bindir}/lupdate
 %dir %{_qt4_plugindir}/designer
 %{_qt4_plugindir}/designer/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/apps/linguist*
+%{_datadir}/applications/designer.desktop
 %{_datadir}/icons/hicolor/*/apps/designer*
 %{_qt4_docdir}/qch/designer.qch
-%{_qt4_docdir}/qch/linguist.qch
 
 %files devel
 %defattr(-,root,root,-)
 %attr(0755,root,root) %config /etc/profile.d/*
-%{_bindir}/*
-%{_qt4_bindir}/*
-%exclude %{_bindir}/qdbus
-%exclude %{_qt4_bindir}/qdbus
-%exclude %{_qt4_bindir}/designer
-%exclude %{_qt4_bindir}/linguist
-%exclude %{_qt4_bindir}/lrelease
-%exclude %{_qt4_bindir}/lupdate
+%{_bindir}/qdbuscpp2xml
+%{_bindir}/qdbusxml2cpp
+%{_bindir}/qt3to4
+%{_bindir}/rcc
+%{_bindir}/uic3
+%{_qt4_bindir}/lrelease
+%{_qt4_bindir}/lupdate
+%{_qt4_bindir}/moc
+%{_qt4_bindir}/qdbuscpp2xml
+%{_qt4_bindir}/qdbusxml2cpp
+%{_qt4_bindir}/qmake
+%{_qt4_bindir}/qt3to4
+%{_qt4_bindir}/rcc
+%{_qt4_bindir}/uic
+%{_qt4_bindir}/uic3
 %{_qt4_headerdir}
 %{_qt4_libdir}/libQt*.so
 %{_qt4_libdir}/libQtUiTools*.a
@@ -841,13 +873,37 @@ fi
 #{_datadir}/applications/*assistant.desktop
 #{_datadir}/icons/hicolor/*/apps/assistant*
 
-%if %{phonon}
-%files -n phonon-backend-gstreamer
+%files tools
 %defattr(-,root,root,-)
-%{_qt4_plugindir}/phonon_backend/*_gstreamer.so
-%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
-%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
-%endif
+%{_bindir}/lconvert
+%{_bindir}/pixeltool
+%{_bindir}/qcollectiongenerator
+%{_bindir}/qdbusviewer
+%{_bindir}/qdoc3
+%{_bindir}/qhelpconverter
+%{_bindir}/qhelpgenerator
+%{_bindir}/qmlviewer
+%{_bindir}/qttracereplay
+%{_bindir}/xmlpatterns
+%{_bindir}/xmlpatternsvalidator
+%{_qt4_bindir}/assistant
+%{_qt4_bindir}/lconvert
+%{_qt4_bindir}/linguist
+%{_qt4_bindir}/pixeltool
+%{_qt4_bindir}/qcollectiongenerator
+%{_qt4_bindir}/qdbusviewer
+%{_qt4_bindir}/qdoc3
+%{_qt4_bindir}/qhelpconverter
+%{_qt4_bindir}/qhelpgenerator
+%{_qt4_bindir}/qmlviewer
+%{_qt4_bindir}/qttracereplay
+%{_qt4_bindir}/xmlpatterns
+%{_qt4_bindir}/xmlpatternsvalidator
+%{_datadir}/applications/assistant.desktop
+%{_datadir}/applications/linguist.desktop
+%{_datadir}/icons/hicolor/*/apps/assistant*
+%{_datadir}/icons/hicolor/*/apps/linguist*
+%{_qt4_docdir}/qch/linguist.qch
 
 %if %{MySQL}
 %files MySQL
@@ -924,6 +980,13 @@ fi
 %endif
 
 %changelog
+* Sun Mar  6 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.2-1
+- new upstream release
+- updated Patch1022
+- added config, tools subpackage
+- added /etc/rpm/macros.qt4
+- updated %%post, %%posttrans and %%postun section
+
 * Sat Jan 29 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.1-1
 - new upstream release
 

s/scim-bridge/scim-bridge-vl.spec

@@ -2,10 +2,10 @@
 
 %define name scim-bridge
 %define version 0.4.16
-%define release 13%{?_dist_release}
+%define release 15%{?_dist_release}
 
 %define qt3_ver 3.3.8
-%define qt4_ver 4.7.1
+%define qt4_ver 4.7.2
 
 # build qt3 immodule ("--without qt3" to disable qt3)
 %bcond_without qt3
@@ -27,6 +27,11 @@ Summary(ja): もう一つ別の SCIM IM クライアント
 Name: %{name}
 Version: %{version}
 Release: %{release}
+
+Group: System Environment/Libraries
+License: GPL/LGPL
+URL: http://www.scim-im.org/projects/scim_bridge
+
 Source0: http://1jaist.dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 
 # Patch from Fedora 10
@@ -43,16 +48,13 @@ Patch5: scim-bridge-0.4.15-hotkey-help.patch
 Patch6: scim-bridge-0.4.16-fix-gtk-key-snooper.patch
 Patch7: scim-bridge-0.4.16-fixes-null-imengine.patch
 
-URL: http://www.scim-im.org/projects/scim_bridge
-License: GPL/LGPL
-Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Prefix: %{_prefix}
-Requires: scim >= 1.4
 BuildRequires: scim-devel >= 1.4
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: gtk2-devel >= 2.14.0
 
+Requires: scim >= 1.4
+
 %description
 Scim-bridge is yet another IM client of SCIM.
 The im-module of scim-bridge communicates with scim via socket.
@@ -85,6 +87,7 @@ Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       qt = %{_qt3_version}
 BuildRequires:  qt-devel 
+BuildRequires:  libXmu-devel
 
 %description qt
 This package provides the SCIM Bridge Qt IM module.
@@ -262,6 +265,12 @@ export QT4_PREFIX=%{_qt4_prefix}
 
 
 %changelog
+* Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-15
+- rebuilt with qt4-4.7.2
+
+* Sat Feb  5 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-14
+- added BR: libXmu-devel to qt package
+
 * Sun Jan 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-13
 - rebuilt with qt4-4.7.1
 

u/uim/uim-vl.spec

@@ -10,7 +10,7 @@
 %define with_canna	0
 
 %define qt3_ver 3.3.8
-%define qt4_ver 4.7.1
+%define qt4_ver 4.7.2
 # Qt3 version auto-detection -- inagaki
 %define _qt3_version %(rpm -q --queryformat "%%{version}" qt-devel 2>/dev/null || echo %{qt3_ver})
 %define _qt3_prefix  %{_libdir}/qt-%{_qt3_version}
@@ -29,7 +29,7 @@ Name: uim
 Summary: Uim an input method library
 Summary(ja): 入力メソッドライブラリ
 Version: 1.6.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: LGPLv2/BSD
 Group: System Environment/Libraries
@@ -750,6 +750,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.1-2
+- rebuilt with qt4-4.7.2
+
 * Sun Jan 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.1-1
 - new upstream release
 - built with qt4-4.7.1