update: qt4, phonon, uim, scim-bridge

NEW: phonon-backend-{gstreamer, xine}


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

p/phonon-backend-gstreamer/phonon-backend-gstreamer-vl.spec

@@ -0,0 +1,122 @@
+%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo 4.4.4)
+%global _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.1)
+
+Name:    phonon-backend-gstreamer
+Summary: Gstreamer phonon backend 
+Summary(ja): Phonon の gstreamer バックエンド
+Version: 4.4.4
+Release: 2%{?_dist_release}
+
+Group:   System Environment/Libraries
+License: LGPLv2+
+URL:     http://phonon.kde.org/
+
+Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-gstreamer/%{version}/src/phonon-backend-gstreamer-%{version}.tar.bz2
+
+## Mandriva/upstreamable patches
+Patch52: phonon-4.3.50-gstreamer-fix-seekable-query-failed.patch
+
+## Ubuntu/upstreamable patches
+Patch60: phonon-4.4.3-flac_mimetype.patch
+
+## Upstream patches
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires: automoc4
+BuildRequires: cmake
+BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: phonon-devel >= 4.4.4
+
+Provides: phonon-backend = %{phonon_version}
+
+Obsoletes: phonon-backend-gst < 4.2.0-4
+Provides:  phonon-backend-gst = %{version}-%{release}
+
+Obsoletes: phonon-gstreamer < 4.4.4-0.2
+Provides:  phonon-gstreamer = %{version}-%{release}
+
+Requires: gstreamer-plugins-good
+# not *strictly* required, but strongly recommended by upstream when built
+# with USE_INSTALL_PLUGIN
+#Requires: PackageKit-gstreamer-plugin
+Requires: phonon => %{phonon_version}
+Requires: qt4 >= %{_qt4_version}
+
+%description
+%{summary}.
+
+%description -l ja
+Phonon の gstreamer バックエンドです.
+
+%prep
+%setup -q -n phonon-backend-gstreamer-%{version}
+
+%patch52 -p1 -b .gstreamer-fix-seekable-query-failed
+%patch60 -p1 -b .flac_mimetype
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} \
+  -DUSE_INSTALL_PLUGIN:BOOL=ON \
+  ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING.LIB
+%{_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
+%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
+
+
+%changelog
+* Sun Jan 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.4-2
+- Initial build for VineSeed 
+
+* Fri Jan 21 2011 Rex Dieter <rdieter@fedoraproject.org> 4.4.4-1
+- phonon-backend-gstreamer-4.4.4
+
+* Fri Jan 07 2011 Rex Dieter <rdieter@fedoraproject.org> - 2:4.4.4-0.4.20110104
+- Requires: PackageKit-gstreamer-plugin , avoids potential crashers elsewhere 
+  when built with USE_INSTALL_PLUGIN (kde#262308)
+
+* Wed Jan 05 2011 Rex Dieter <rdieter@fedoraproject.org> - 2:4.4.4-0.3.20110104
+- %%doc COPYING.LIB
+- add comment on pnonon-gstreamer_snapshot.sh usage
+
+* Wed Jan 05 2011 Rex Dieter <rdieter@fedoraproject.org> - 2:4.4.4-0.2.20110104
+- phonon-backend-gstreamer
+
+* Tue Jan 04 2011 Rex Dieter <rdieter@fedoraproject.org> - 4.4.4-0.1.20110104
+- phonon-gstreamer-4.4.4-20110104 snapshot
+

p/phonon-backend-xine/phonon-backend-xine-vl.spec

@@ -0,0 +1,102 @@
+%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo 4.4.4)
+%global _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.1)
+
+Name:    phonon-backend-xine
+Summary: Xine phonon backend 
+Summary(ja): Phonon の xine バックエンド
+Version: 4.4.4
+Release: 2%{?_dist_release}
+
+Group:   System Environment/Libraries
+License: LGPLv2+
+URL:     http://phonon.kde.org/
+
+Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-xine/%{version}/src/phonon-backend-xine-%{version}.tar.bz2
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: automoc4
+BuildRequires: cmake
+BuildRequires: phonon-devel >= 4.4.4
+BuildRequires: libxcb-devel
+BuildRequires: xine-lib-devel
+
+Provides: phonon-backend%{?_isa} = %{phonon_version}
+
+Obsoletes: phonon-xine < 4.4.4-0.2
+Provides:  phonon-xine = %{version}-%{release}
+
+Requires: phonon => %{phonon_version}
+Requires: qt4 >= %{_qt4_version}
+
+%description
+%{summary}.
+
+%description -l ja
+Phonon の xine バックエンドです.
+
+%prep
+%setup -q -n phonon-backend-xine-%{version}
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} \
+  -DUSE_INSTALL_PLUGIN=TRUE \
+  ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
+# move icons to hicolor
+mv $RPM_BUILD_ROOT%{_datadir}/icons/oxygen \
+   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+
+%postun
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING.LIB
+%{_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
+%{_datadir}/kde4/services/phononbackends/xine.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-xine.*
+
+
+
+%changelog
+* Sun Jan 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.4-2
+- Initial build for VineSeed 
+
+* Fri Jan 21 2011 Rex Dieter <rdieter@fedoraproject.org> 4.4.4-1
+- phonon-backend-xine-4.4.4
+
+* Wed Jan 05 2011 Rex Dieter <rdieter@fedoraproject.org> -  4.4.4-0.3.20110104
+- %%doc COPYING.LIB
+- add comment on pnonon-xine_snapshot.sh usage
+
+* Wed Jan 05 2011 Rex Dieter <rdieter@fedoraproject.org> -  4.4.4-0.2.20110104
+- phonon-backend-xine
+
+* Tue Jan 04 2011 Rex Dieter <rdieter@fedoraproject.org> -  4.4.4-0.1.20110104
+- phonon-xine-4.4.4-20110104 snapshot

p/phonon/phonon-vl.spec

@@ -1,36 +1,26 @@
-%define qt4_ver 4.6.3
+%define qt4_ver 4.7.1
 # 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})
 %define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/include)
 
-%define tar_ver 4.4
+%global pulseaudio_version %(pkg-config --modversion libpulse 2>/dev/null || echo 0.9.15)
 
 Name: phonon
 Summary: Multimedia framework api
 Summary(ja): マルチメディアフレームワーク API
-Version: 4.4.3
+Version: 4.4.4
 Release: 1%{?_dist_release}
 
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://phonon.kde.org/
 
-Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/4.4.3/phonon-%{version}.tar.bz2
-
-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
+Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/4.4.4/phonon-%{version}.tar.bz2
 
+Patch1: phonon-4.4.4-no_rpath.patch
 ## Mandriva/upstreamable patches
-Patch51: phonon-4.3.50-fix-decodebin-usage.patch
-Patch52: phonon-4.3.50-gstreamer-fix-seekable-query-failed.patch
 Patch53: phonon-4.3.50-phonon-allow-stop-empty-source.patch
-Patch57: phonon-4.3.80-pulse-devicemove-rejig.patch
 
 ## Upstream patches
 
@@ -38,16 +28,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.2
 BuildRequires: glib2-devel
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
-BuildRequires: qt4-devel >= 4.4.0
-BuildRequires: xine-lib-devel
-BuildRequires: pulseaudio-libs-devel 
+BuildRequires: qt4-devel >= 4.6.0
+BuildRequires: pulseaudio-libs-devel >= 0.9.15
 
-Requires: phonon-backend >= %{version}
-Requires: qt4 >= 4.4.0
+# TODO: enable the following Requires in next release
+#Requires: phonon-backend >= 4.4
+Requires: pulseaudio-libs >= %{pulseaudio_version}
+Requires: qt4 >= %{_qt4_version}
 
 %description
 Phonon is a cross-platform portable Multimedia Support Abstraction,
@@ -55,32 +44,12 @@ which allows you to play multiple audio or video formats with the same
 quality on all platforms, no matter which underlying architecture is
 used.
 
-%package backend-gstreamer
-Summary: Gstreamer phonon backend
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gstreamer-plugins-good
-Obsoletes: %{name}-backend-gst < 4.2.0-4
-Provides:  %{name}-backend-gst = %{version}-%{release}
-Provides: phonon-backend = %{version}-%{release}
-
-%description backend-gstreamer
-%{summary}.
-
-%package backend-xine
-Summary: xine phonon backend
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Provides: phonon-backend = %{version}-%{release}
-
-%description backend-xine
-%{summary}.
-
 %package devel
 Summary: Development files for phonon
+Summary(ja): phonon の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: qt4-devel = %{_qt4_version}
+Requires: qt4-devel
 
 %description devel
 Header files for developing applications using phonon
@@ -88,10 +57,8 @@ Header files for developing applications using phonon
 %prep
 %setup -q
 
-#patch51 -p0 -b .fix-decodebin-usage
-%patch52 -p1 -b .gstreamer-fix-seekable-query-failed
+%patch1 -p1 -b .no_rpath
 %patch53 -p1 -b .phonon-allow-stop-empty-source
-#patch57 -p1 -b .pulse-devicemove-rejig
 
 
 %build
@@ -103,7 +70,6 @@ mkdir -p %{_target_platform}
 pushd %{_target_platform}
 unset QTDIR || : ; . /etc/profile.d/qt4.sh
 %cmake \
-    -DUSE_INSTALL_PLUGIN=TRUE \
     ..
 popd
 
@@ -111,25 +77,15 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 # symlink for qt/phonon compatibility
 ln -s ../KDE/Phonon $RPM_BUILD_ROOT%{_includedir}/phonon/Phonon
 
-# move the oxygen-only phonon-xine icons to hicolor
-test -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor && exit 0
-mv $RPM_BUILD_ROOT%{_datadir}/icons/oxygen \
-   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
-
-# gstreamer icons
-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
-
+# own these dirs
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/plugins/phonon_backend/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde4/services/phononbackends/
 
 mkdir -p $RPM_BUILD_ROOT%{_qt4_headerdir}
 pushd $RPM_BUILD_ROOT%{_qt4_headerdir}
@@ -143,22 +99,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-%posttrans backend-gstreamer
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
-
-%posttrans backend-xine
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
-
-%postun backend-gstreamer
-if [ $1 -eq 0 ] ; then
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
-fi
-
-%postun backend-xine
-if [ $1 -eq 0 ] ; then
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
-fi
-
 %files
 %defattr(-,root,root)
 %doc COPYING.LIB
@@ -168,29 +108,22 @@ fi
 %dir %{_libdir}/kde4/plugins/phonon_backend
 %dir %{_datadir}/kde4/services/phononbackends
 
-%files backend-gstreamer
-%defattr(-,root,root,-)
-%{_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
-%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
-%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
-
-%files backend-xine
-%defattr(-,root,root,-)
-%{_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
-%{_datadir}/kde4/services/phononbackends/xine.desktop
-%{_datadir}/icons/hicolor/*/apps/phonon-xine.*
-
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/KDE
 %{_includedir}/KDE/Phonon/
 %{_includedir}/phonon/
 %{_qt4_headerdir}/phonon
+%{_qt4_prefix}/mkspecs/modules/qt_phonon.pri
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%{_qt4_prefix}/mkspecs/modules/qt_phonon.pri
+%{_datadir}/phonon-buildsystem/
 
 %changelog
+* 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
+
 * Mon Dec 13 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.4.3-1
 - new upstream release
 

q/qt4/qt4-vl.spec

@@ -1,4 +1,4 @@
-%define _default_patch_fuzz 3 
+#define _default_patch_fuzz 3 
 
 %define phonon 0
 %define MySQL 1
@@ -17,6 +17,7 @@
 %define _qt4_docdir %{_docdir}/qt4
 %define _qt4_examplesdir %{_qt4_prefix}/examples
 %define _qt4_headerdir %{_qt4_prefix}/include 
+%define _qt4_importdir %{_qt4_prefix}/imports 
 %define _qt4_libdir %{_qt4_prefix}/lib
 %define _qt4_plugindir %{_qt4_prefix}/plugins
 %define _qt4_sysconfdir %{_sysconfdir}
@@ -24,23 +25,27 @@
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
+# 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.6.3
-Release: 3%{?_dist_release}
+Version: 4.7.1
+Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
-License: LGPLv2 with exceptions or GPLv3 with exceptions
+License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
 Group: System Environment/Libraries
 URL: http://www.qtsoftware.com/
 
 Source: ftp://ftp.qtsoftware.com/qt/source/qt-%{type}-%{version}.tar.gz
+# default Qt config file
 Source4: Trolltech.conf
-# See http://bugzilla.redhat.com/223663
-%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
+# 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
@@ -49,86 +54,97 @@ Source14: hi48-phonon-gstreamer.png
 Source15: hi64-phonon-gstreamer.png
 Source16: hi128-phonon-gstreamer.png
 
+# desktop files
 Source21: designer.desktop
 Source22: linguist.desktop
+
 # upstream qt4-logo, http://trolltech.com/images/products/qt/qt4-logo
 Source30: hi128-app-qt4-logo.png
 Source31: hi48-app-qt4-logo.png
 
-# multilib hacks 
+# set default QMAKE_CFLAGS_RELEASE
 Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
-Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
+
+# get rid of timestamp which causes multilib problem
 Patch4: qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
-Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
-# hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
-Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
+
+# enable ft lcdfilter
 Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
+
 # include kde4 plugin path, http://bugzilla.redhat.com/498809
-Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch 
-# make PulseAudio the default device in Phonon
-Patch17: qt-x11-opensource-src-4.5.2-pulseaudio.patch
-Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
-Patch21: qt-everywhere-opensource-src-4.6.0-gst-pulsaudio.patch
+# omit for now, (seems?) causes unwelcome side-effects -- Rex
+Patch16: qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch 
+
+# phonon gstreamer services
+Patch19: qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch 
+
 # may be upstreamable, not sure yet
 # workaround for gdal/grass crashers wrt glib_eventloop null deref's
 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
+
 ## upstreamable bits
-# http://bugzilla.redhat.com/485677
-Patch51: qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch 
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
+
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
-Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
+Patch54: qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
+
 # http://bugs.kde.org/show_bug.cgi?id=180051#c22
 Patch55: qt-everywhere-opensource-src-4.6.2-cups.patch
-# fix type cast issue on s390x
-Patch56: qt-everywhere-opensource-src-4.6.2-webkit-s390x.patch
-# fix type cast issue on sparc64
-Patch57: qt-everywhere-opensource-src-4.6.2-webkit-sparc64.patch
+
+# Add s390x as 64bit and s390 as 31bit bigendian platform
+Patch56: qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
+
 # qtwebkit to search nspluginwrapper paths too
 Patch58: qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
 
-# security patches
-# https://bugs.webkit.org/show_bug.cgi?id=40567
-Patch100: qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_gtk_init.patch
-Patch104: qt-everywhere-opensource-src-4.6.2-cve-2010-0051-lax-css-parsing-cross-domain-theft.patch
-Patch106: qt-everywhere-opensource-src-4.6.2-cve-2010-0656.patch
-Patch108: qt-everywhere-opensource-src-4.6.2-cve-2010-0648.patch
-Patch109: qt-everywhere-opensource-src-4.6.3-CVE-2010-1303_1304.patch
-Patch110: qt-everywhere-opensource-src-4.6.3-CVE-2010-1392.patch
-Patch111: qt-everywhere-opensource-src-4.6.3-CVE-2010-1396.patch
-Patch112: qt-everywhere-opensource-src-4.6.3-CVE-2010-1397.patch
-Patch113: qt-everywhere-opensource-src-4.6.3-CVE-2010-1398.patch
-Patch114: qt-everywhere-opensource-src-4.6.3-CVE-2010-1400.patch
-Patch115: qt-everywhere-opensource-src-4.6.3-CVE-2010-1412.patch
-Patch116: qt-everywhere-opensource-src-4.6.3-CVE-2010-1770.patch
-Patch117: qt-everywhere-opensource-src-4.6.3-CVE-2010-1773.patch
-Patch118: qt-everywhere-opensource-src-4.6.3-CVE-2010-1774.patch
-Patch119: qt-everywhere-opensource-src-4.6.3-CVE-2010-1119.patch
-Patch120: qt-everywhere-opensource-src-4.6.3-CVE-2010-1778.patch
+# indic incorrect rendering
+Patch59: qt-4.6.3-bn-rendering-bz562049.patch
+Patch60: qt-4.6.3-bn-rendering-bz562058.patch
+Patch61: qt-4.6.3-indic-rendering-bz631732.patch
+Patch62: qt-4.6.3-indic-rendering-bz636399.patch
+
+# fix 24bit color issue
+Patch63: qt-everywhere-opensource-src-4.7.0-bpp24.patch
+
+# Fails to create debug build of Qt projects on mingw (rhbz#653674)
+Patch64: qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch
+
+# fix QTreeView crash triggered by KPackageKit (patch by David Faure)
+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
 
 # kde-qt git patches
-Patch201: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
 Patch202: 0002-This-patch-makes-override-redirect-windows-popup-men.patch
-Patch203: 0003-This-patch-changes-QObjectPrivateVersion-thus-preven.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
-Patch206: 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
-Patch207: 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-ge.patch
-Patch208: 0008-This-patch-makes-the-raster-graphics-system-use-shar.patch
-Patch209: 0009-Restore-a-section-of-the-file-that-got-removed-due-t.patch
 Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
-Patch217: http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/55ef01d93f8257b5927660290fc1ead0b2b74ec9.patch
-# QTBUG-9793
-Patch218: http://qt.gitorious.org/qt/qt/commit/0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c.patch
+
+# security patches
+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.6.0-system_ca_certificates_vine.patch 
+Patch1022: qt-x11-opensource-src-4.7.1-system_ca_certificates_vine.patch 
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 %if %{?_dist_release} == "vl4"
 BuildRequires: gcc4 gcc4-c++ XOrg-devel XOrg-gl-devel
 %else
@@ -158,6 +174,8 @@ BuildRequires: MySQL-devel
 %endif
 %if %{PostgreSQL}
 BuildRequires: postgresql-devel
+BuildRequires: krb5-devel libxslt-devel openssl-devel pam-devel 
+BuildRequires: readline-devel zlib-devel
 %endif
 %if %{ODBC}
 BuildRequires: unixODBC-devel 
@@ -182,8 +200,20 @@ 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 designer
+Summary: Interface designer (IDE) for the Qt toolkit
+Group: Applications/Development
+Requires: %{name}-devel = %{version}-%{release}
+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 
@@ -199,26 +229,15 @@ Requires(postun): alternatives
 Provides: WebKit-qt-devel
 
 %description 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.
-
-Install qt-devel if you want to develop GUI applications using the Qt
-toolkit.
+This package contains the files necessary to develop
+applications using the Qt toolkit.  Includes:
+Qt Linguist
 
 %package doc
-Summary: API documentation for %{name}
-Summary(ja): Qt の API ドキュメント
+Summary: API documentation for Qt4
+Summary(ja): Qt4 の API ドキュメント
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
-#Requires: %{name}-assistant
-#Obsoletes: qt4-doc < %{version}-%{release}
-#Provides:  qt4-doc = %{version}-%{release}
-#BuildArch: noarch
 
 %description doc
 %{summary}.
@@ -268,17 +287,6 @@ Requires: %{name} = %{version}-%{release}
 %description sqlite
 SQLite driver for Qt's SQL classes (QSQL)
 
-%package designer
-Summary: Interface designer (IDE) for the Qt toolkit
-Group: Applications/Development
-Requires: %{name}-devel = %{version}-%{release}
-Requires(post):   alternatives
-Requires(postun): alternatives
-
-%description designer
-The qt-designer package contains an User Interface designer tool
-for the Qt toolkit.
-
 # compat32
 %package -n compat32-%{name}
 Summary: The shared library for the Qt GUI toolkit.
@@ -316,64 +324,42 @@ toolkit.
 %prep
 %setup -q -n qt-everywhere-opensource-src-%{version}
 
-# don't use -b on mkspec files, else they get installed too.
-# multilib hacks no longer required
-%patch2 -p1
-#if "%{_qt4_datadir}" != "%{_qt4_prefix}"
-#patch3 -p1 -b .multilib-QMAKEPATH
-#endif
-%patch4 -p1 -b .uic_multilib
-
-%patch5 -p1 -b .bz#437440-as_IN-437440
-%patch13 -p1 -b .gcc_hack
 %patch15 -p1 -b .enable_ft_lcdfilter
-%patch16 -p1 -b .kde4_plugins
-%patch17 -p1 -b .phonon-pulseaudio
-%patch19 -p1 -b .servicesfile
-%patch21 -p1 -b .gst-pulsaudio
+#patch16 -p1 -b .kde4_plugins
+%patch19 -p1 -b .phonon_servicesfile
 %patch23 -p1 -b .glib_eventloop_nullcheck
-%patch51 -p1 -b .qdoc3
+%patch24 -p1 -b .webkit
 ## TODO: still worth carrying?  if so, upstream it.
 %patch53 -p1 -b .qatomic-inline-asm
 ## TODO: upstream me
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .cups-1
-%patch56 -p1 -b .typecast_s390x
-%patch57 -p1 -b .typecast_sparc64
+%patch56 -p1 -b .s390x
 %patch58 -p1 -b .qtwebkit_pluginpath
+%patch59 -p1 -b .bn-rendering-bz562049
+%patch60 -p1 -b .bn-rendering-bz562058
+%patch61 -p1 -b .indic-rendering-bz631732
+%patch62 -p1 -b .indic-rendering-bz636399
+%patch63 -p1 -b .bpp24
+%patch64 -p1 -b .QTBUG-14467
+%patch65 -p1 -b .qtreeview-kpackagekit-crash
 
 # upstream patches
-%patch100 -p1 -b .qtwebkit_gtk_init
-
-# security fixes
-%patch104 -p1 -b .cve-2010-0051-lax-css-parsing-cross-domain-theft
-%patch106 -p1 -b .cve-2010-0656
-%patch108 -p1 -b .cve-2010-0648
-%patch109 -p1 -b .CVE-2010-1303_1304
-%patch110 -p1 -b .CVE-2010-1392
-%patch111 -p1 -b .CVE-2010-1396
-%patch112 -p1 -b .CVE-2010-1397
-%patch113 -p1 -b .CVE-2010-1398
-%patch114 -p1 -b .CVE-2010-1400
-%patch115 -p1 -b .CVE-2010-1412
-%patch116 -p1 -b .CVE-2010-1770
-%patch117 -p1 -b .CVE-2010-1773
-%patch118 -p1 -b .CVE-2010-1774
-%patch119 -p1 -b .CVE-2010-1119
-%patch120 -p1 -b .CVE-2010-1778
-
+%patch100 -p1 -b .ml_IN-rendering
+%patch101 -p1 -b .qtextcursor-crash
+%patch102 -p1 -b .QTBUG-15857-2
+%patch103 -p1 -b .qsortfilterproxymodel_merge934
 
 # kde-qt branch
-%patch201 -p1 -b .kde-qt-0001
+%if 0%{?kde_qt}
 %patch202 -p1 -b .kde-qt-0002
-%patch203 -p1 -b .kde-qt-0003
 %patch204 -p1 -b .kde-qt-0004
 %patch205 -p1 -b .kde-qt-0005
-%patch206 -p1 -b .kde-qt-0006
-%patch207 -p1 -b .kde-qt-0007
 %patch212 -p1 -b .kde-qt-0012
-%patch217 -p1 -b .QT_GRAPHICSSYSTEM
-%patch218 -p1 -b .QTBUG-9793
+%endif
+
+# security fixes
+%patch300 -p1 -b .CVE-2010-1822-crash-svg-image
 
 # Patches for Vine
 %patch1022 -p1 -b .system_ca_certificates
@@ -393,6 +379,13 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
 %define platform linux-g++
 %endif
 
+# multilib hacks
+# multilib hacks no longer required
+%patch2 -p1 -b .multilib
+# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
+rm -fv mkspecs/linux-g++*/qmake.conf.multilib
+%patch4 -p1 -b .uic_multilib
+
 sed -i \
   -e "s|-O2|$RPM_OPT_FLAGS|g" \
   -e "s|g++.conf|g++-multilib.conf|g" mkspecs/%{platform}/qmake.conf
@@ -411,9 +404,9 @@ if [ "%{_lib}" == "lib64" ] ; then
 fi
 
 # let makefile create missing .qm files, the .qm files should be included in qt upstream
-#for f in translations/*.ts ; do
-#  touch ${f%.ts}.qm
-#done
+for f in translations/*.ts ; do
+    touch ${f%.ts}.qm
+done
 
 %build
 # build shared, threaded (default) libraries
@@ -494,7 +487,7 @@ fi
 make %{?_smp_mflags}
 
 # recreate .qm files
-#LD_LIBRARY_PATH=`pwd`/lib bin/lrelease translations/*.ts
+LD_LIBRARY_PATH=`pwd`/lib bin/lrelease translations/*.ts
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -601,6 +594,7 @@ demosdir=%{_qt4_demosdir}
 docdir=%{_qt4_docdir}
 examplesdir=%{_qt4_examplesdir}
 headerdir=%{_qt4_headerdir}
+importdir=%{_qt4_importdir}
 libdir=%{_qt4_libdir}
 plugindir=%{_qt4_plugindir}
 qmake=%{_qt4_bindir}/qmake
@@ -612,10 +606,10 @@ Description: Qt Configuration
 Version: %{version}
 EOF
 
-# create/own %%_qt4_plugindir/styles
-mkdir %{buildroot}%{_qt4_plugindir}/styles
-# create/own %%_qt4_plugindir/gui_platform
+# 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
@@ -702,10 +696,15 @@ fi
                 uic3 \
                 %{_qt4_bindir}/uic3 \
 
+if [ ! -f %{_bindir}/qtconfig ] ; then
+    /sbin/update-alternatives --auto qtconfig
+fi
+
+
 %postun devel
 if [ $1 -eq 0 ] ; then
-    %{_syssbindir}/update-alternatives --remove qtconfig %{_qt4_bindir}/qtconfig
-    [ -f "%{_bindir}/qtconfig" ] || %{_syssbindir}/update-alternatives --auto qtconfig
+    /sbin/update-alternatives --remove qtconfig %{_qt4_bindir}/qtconfig
+    /sbin/update-alternatives --auto qtconfig
 fi
 
 # phonon-backend-gstreamer
@@ -769,11 +768,19 @@ fi
 %dir %{_qt4_prefix}
 %dir %{_qt4_libdir}
 %{_qt4_libdir}/libQt*.so.*
+%dir %{_qt4_importdir}
+%dir %{_qt4_importdir}/Qt
+%{_qt4_importdir}/Qt/*
+%dir %{_qt4_importdir}/QtWebKit
+%{_qt4_importdir}/QtWebKit/*
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/accessible
 %{_qt4_plugindir}/accessible/*
+%dir %{_qt4_plugindir}/bearer
+%{_qt4_plugindir}/bearer/*
 %dir %{_qt4_plugindir}/codecs
 %{_qt4_plugindir}/codecs/*
+%dir %{_qt4_plugindir}/crypto/
 %dir %{_qt4_plugindir}/graphicssystems
 %{_qt4_plugindir}/graphicssystems/*
 %dir %{_qt4_plugindir}/iconengines
@@ -788,6 +795,20 @@ fi
 %{_qt4_translationdir}/*
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
+%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}/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/*
@@ -852,20 +873,6 @@ fi
 %{_qt4_plugindir}/sqldrivers/libqsqlite*
 %endif
 
-%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}/icons/hicolor/*/apps/designer*
-%{_qt4_docdir}/qch/designer.qch
-%{_qt4_docdir}/qch/linguist.qch
-
 # compat32
 %if %{build_compat32}
 %files -n compat32-%{name}
@@ -917,6 +924,9 @@ fi
 %endif
 
 %changelog
+* Sat Jan 29 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.1-1
+- new upstream release
+
 * Wed Jan 12 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.6.3-3
 - rebuild with openssl-1.0.0c
 - add BuildRequires: alsa-lib-devel

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

@@ -2,10 +2,10 @@
 
 %define name scim-bridge
 %define version 0.4.16
-%define release 12%{?_dist_release}
+%define release 13%{?_dist_release}
 
 %define qt3_ver 3.3.8
-%define qt4_ver 4.6.3
+%define qt4_ver 4.7.1
 
 # build qt3 immodule ("--without qt3" to disable qt3)
 %bcond_without qt3
@@ -262,6 +262,9 @@ export QT4_PREFIX=%{_qt4_prefix}
 
 
 %changelog
+* Sun Jan 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-13
+- rebuilt with qt4-4.7.1
+
 * Sat Oct 09 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.16-12
 - added compat32-* packages for x86_64 architecture support
 

u/uim/uim-vl.spec

@@ -10,7 +10,7 @@
 %define with_canna	0
 
 %define qt3_ver 3.3.8
-%define qt4_ver 4.6.1
+%define qt4_ver 4.7.1
 # 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}
@@ -27,9 +27,9 @@
 
 Name: uim
 Summary: Uim an input method library
-Summary(ja): uim - 入力メソッドライブラリ
-Version: 1.6.0
-Release: 4%{?_dist_release}
+Summary(ja): 入力メソッドライブラリ
+Version: 1.6.1
+Release: 1%{?_dist_release}
 
 License: LGPLv2/BSD
 Group: System Environment/Libraries
@@ -750,6 +750,10 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Jan 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.1-1
+- new upstream release
+- built with qt4-4.7.1
+
 * Sun Jan  2 2011 IWAI, Masaharu <iwai@alib.jp> 1.6.0-4
 - build with eb 4.4.3