update: akonadi, automoc4, herqq, ibus-qt, kdebase-runtime, libqzeitgeist, phonon, PyQt4, qca2, qca-ossl, qt4, qt-assistant-adp, qscintilla, qtsoap, uim

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

P/PyQt4/PyQt4-vl.spec

@@ -2,16 +2,16 @@
 %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(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 _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.8.0)
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %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.4
-Release: 2%{?_dist_release}
+Version: 4.9
+Release: 1%{?_dist_release}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -28,7 +28,6 @@ Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
 Patch100: PyQt-x11-gpl-4.7.3-phononpath_vine.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-#BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
 BuildRequires: findutils
 BuildRequires: libXext-devel
@@ -37,8 +36,9 @@ BuildRequires: python-devel
 # beware of PyQt4/qscintilla bootstap issues
 #BuildRequires: qscintilla
 BuildRequires: qt4-devel >= 4.5.0
-BuildRequires: sip-devel >= 4.12.1
-Requires: sip >= 4.12.1
+BuildRequires: qt-assistant-adp-devel
+BuildRequires: sip-devel >= 4.13.1
+Requires: sip >= 4.13.1
 Requires: dbus-python
 Requires: qt4
 
@@ -49,7 +49,9 @@ These are Python bindings for Qt4.
 Summary: Files needed to build other bindings based on Qt4
 Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: sip-devel >= 4.12.1
+Requires: qt4-devel >= 4.5.0
+Requires: qt-assistant-adp-devel
+Requires: sip-devel >= 4.13.1
 
 %description devel
 Files needed to build other bindings for C++ classes that inherit from any
@@ -62,18 +64,15 @@ of the Qt4 classes (e.g. KDE or your own).
 %patch1 -p1 -b .64bit
 %endif
 %patch2 -p1 -b .QT_SHARED
-#patch4 -p1 
 
-%patch100 -p1 -b .phononpath_vine 
+#patch100 -p1 -b .phononpath_vine 
 
 ## permissions
 # mark examples non-executable
 find examples/ -name "*.py" | xargs chmod a-x
 chmod a+rx pyuic/uic/pyuic.py
 
-
 %build
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
 CFLAGS="${CFLAGS:-%optflags}" \
 CXXFLAGS="${CXXFLAGS:-%optflags} -I%{_includedir}/KDE" \
 %{__python} configure.py \
@@ -123,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 #{_qt4_prefix}/qsci/api/python/PyQt4.api
 
 %changelog
+* Sat Jan  7 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.9.0-1
+- new upstream release
+- aaded BR: qt-assistant-adp-devel
+
 * Sat Aug 27 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.4-2
 - update Patch1 (PyQt-x11-gpl-4.8.4-64bit.patch) (x86_64 only)
 

a/akonadi/akonadi-vl.spec

@@ -1,6 +1,6 @@
-%define _qt4_ver 4.7.2
+%define _qt4_ver 4.8.0
 %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_version})
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
 ## Can be either MYSQL(uptsream default), SQLITE, or POSTGRES(untested)
@@ -10,7 +10,7 @@ Name:    akonadi
 Summary: PIM Storage Service
 Summary(ja): PIM ストレージサービス
 Version: 1.6.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -38,7 +38,7 @@ BuildRequires: soprano-devel >= 2.5.0
 BuildRequires: sqlite3-devel
 BuildRequires: libICE-devel libXext-devel
 
-Requires: qt4 = %{_qt4_version}
+Requires: qt4 >= %{_qt4_version}
 
 %if "%{?database_backend}" == "MYSQL"
 Requires: qt4-MySQL
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Mon Jan  9 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.6.2-2
+- rebuilt with qt-4.8.0
+
 * Sun Oct 16 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.6.2-1
 - new upstream release
 

a/automoc4/automoc4-vl.spec

@@ -1,13 +1,16 @@
 Name: automoc4
-Version: 0.9.88
-Release: 2%{?_dist_release}
 Summary: automatic moc for Qt 4 packages
-Source: %{name}-%{version}.tar.bz2
-Group: Development/Languages
+Version: 0.9.88
+Release: 3%{?_dist_release}
+
+Group: Development/Tools
 License: BSD
 
+Source: %{name}-%{version}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: qt4-devel cmake
+BuildRequires: cmake
+BuildRequires: qt4-devel
 
 %description
 This package contains the automoc4 binary which is used to run moc
@@ -22,7 +25,6 @@ the Qt toolkit.
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
 %cmake ..
 popd
 
@@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/automoc4/*
 
 %changelog
+* Sun Jan  8 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.9.88-3
+- rebuilt with qt4-4.8.0
+
 * Sun Feb  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.9.88-2
 - rebuilt with new toolchains
 

h/herqq/herqq-vl.spec

@@ -1,6 +1,6 @@
-%define _qt4_ver 4.7.2
+%define _qt4_ver 4.8.0
 %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_version})
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/lib)
 %define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
@@ -8,7 +8,7 @@
 Name:           herqq
 Summary:        A software library for building UPnP devices and control points
 Version:        1.0.0
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 
 # test application is GPLv3 but we do not ship it
 License:        LGPLv3+
@@ -30,7 +30,7 @@ Architecture version 1.1.
 %package devel
 Summary:  Development files for %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: qt4-devel = %{_qt4_version}
+Requires: qt4-devel >= %{_qt4_version}
 
 %description devel
 Header files for developing applications using %{name}.
@@ -64,6 +64,9 @@ make INSTALL_ROOT=%{buildroot} install
 %{_qt4_headerdir}/HUpnpCore/
 
 %changelog
+* Sun Jan  8 2012 Ryoiochi INAGAKI <ryo1@bc.wakwak.com> - 1.0.0-3
+- rebuilt with qt-4.8.0
+
 * Sat Jul 31 2011 Ryoiochi INAGAKI <ryo1@bc.wakwak.com> - 1.0.0-2
 - Initial build for Vine Linux
 

i/ibus-qt/ibus-qt-vl.spec

@@ -1,5 +1,9 @@
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.8.0)
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
+%define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
+
 %define	ver	1.3.0
-%define	rel	1
+%define	rel	2
 
 Summary: Qt IBus library and Qt input method plugin
 Name: ibus-qt
@@ -9,13 +13,12 @@ License: GPLv2+
 Group: System Environment/Libraries
 URL: http://code.google.com/p/ibus/
 Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: cmake
 BuildRequires: qt4-devel >= 4.5
 BuildRequires: dbus-devel >= 1.2
 BuildRequires: libicu-devel >= 4.0
 BuildRequires: doxygen >= 1.6
-#BuildRequires: ibus-devel >= 1.3.0
 Requires: ibus >= 1.3
 
 Vendor: Project Vine
@@ -62,7 +65,7 @@ make install DESTDIR=%{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS README INSTALL
 %{_libdir}/libibus-qt.so.*
-%{_libdir}/qt*4*/plugins/inputmethods/libqtim-ibus.so
+%{_qt4_plugindir}/inputmethods/libqtim-ibus.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -72,6 +75,9 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/libibus-qt.so
 
 %changelog
+* Sat Jan  7 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.3.0-2
+- rebuilt with qt-4.8.0
+
 * Sun Jun  6 2010 IWAI, Masaharu <iwai@alib.jp> 1.3.0-1
 - Initial build.
 

k/kdebase-runtime/kdebase-runtime-vl.spec

@@ -4,7 +4,7 @@ Name:          kdebase-runtime
 Summary:       KDE Runtime
 Summary(ja):   KDE ランタイム
 Version:       4.7.4
-Release:       1%{?_dist_release}
+Release:       2%{?_dist_release}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -56,7 +56,7 @@ BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcanberra-devel 
-BuildRequires: libqzeitgeist-devel 
+#BuildRequires: libqzeitgeist-devel 
 BuildRequires: libsmbclient-devel
 BuildRequires: libssh-devel >= 0.4.2
 BuildRequires: libXpm-devel
@@ -146,7 +146,6 @@ BuildArch: noarch
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
 %cmake \
     -DCMAKE_BUILD_TYPE=release \
     -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
@@ -303,6 +302,9 @@ fi
 
 
 %changelog
+* Mon Jan  9 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.4-2
+- rebuilt without libqzeitgeist
+
 * Tue Dec 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.4-1
 - new upstream release
 

lib/libq/libqzeitgeist/libqzeitgeist-vl.spec

@@ -1,37 +1,53 @@
+%define qt4_ver 4.8.0
+# 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}/qt4)
+%define _qt4_import %(pkg-config --variable importdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/imports)
+
 Name:    libqzeitgeist
 Summary: Qt Zeitgeist Library
-Version: 0.7.0
-Release: 2%{?_dist_release}
+Version: 0.8.0
+Release: 1%{?_dist_release}
 
 License: LGPLv2+
+Group:   System Environment/Libraries
 URL:     http://projects.kde.org/projects/kdesupport/libqzeitgeist 
-Source0: http://releases.zeitgeist-project.com/qzeitgeist/QtZeitgeist-0.7.0.tar.bz2
+
+Source0: http://ftp.kde.org/pub/kde/stable/%{name}/0.8.0/src/%{name}-%{version}.tar.bz2
 
 ## upstreamable patches
-Patch50: libqzeitgeist-0.7.0-pkgconfig_version.patch
+# reduce linking in libqzeitgeist 
+Patch50: libqzeitgeist-0.8.0-reduced_linking.patch
 
 ## upstream patches
-Patch100: libqzeitgeist-0.7.0-libsuffix.patch
+# fix linking (don't link the Qt world, including QtWebkit, only use QT_DECLARATIVE_LIBRARIES)
+# consistently use QT_IMPORTS_DIR
+Patch100: libqzeitgeist-0.8.0-declarative.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: automoc4
 BuildRequires: cmake
-BuildRequires: qt4-devel
+BuildRequires: qt4-devel >= 4.7.0
+BuildRequires: zeitgeist
 
 %description
 %{summary}.
 
 %package devel
 Summary: Development files for %{name}
+Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel
+
 %description devel
 %{summary}
 
 
 %prep
-%setup -q -n QtZeitgeist-%{version}-Source
-
-%patch100 -p1 -b .libsuffix
-%patch50 -p1 -b .pkgconfig_version
+%setup -q 
 
+%patch50 -p1 -b .reduced_linking
+%patch100 -p1 -b .declarative
 
 %build
 mkdir -p %{_target_platform}
@@ -49,7 +65,7 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 %check
 export PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_datadir}/pkgconfig:$RPM_BUILD_ROOT%{_libdir}/pkgconfig
-test "$(pkg-config --modversion QtZeitgeist)" = "%{version}"
+test "$(pkg-config --modversion QZeitgeist)" = "%{version}"
 
 
 %clean
@@ -62,18 +78,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %doc COPYING README
-%{_libdir}/libqzeitgeist.so.0*
+%{_libdir}/libqzeitgeist.so.*
+%dir %{_qt4_import}/org
+%dir %{_qt4_import}/org/gnome
+%dir %{_qt4_import}/org/gnome/zeitgeist
+%{_qt4_import}/org/gnome/zeitgeist/*
 
 %files devel
-%dir %{_datadir}/qzeitgeist/
-%{_datadir}/qzeitgeist/cmake/
-%{_includedir}/QtZeitgeist/
+%{_includedir}/QZeitgeist/
 %{_libdir}/libqzeitgeist.so
-%{_libdir}/pkgconfig/QtZeitgeist.pc
+%dir %{_libdir}/cmake/QZeitgeist
+%{_libdir}/cmake/QZeitgeist/*
+%{_libdir}/pkgconfig/QZeitgeist.pc
 
 
 %changelog
-* Sun Jun  5 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.7.0-2
+* Sun Jan  8 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.8.0-1
+- new upstream release
+- added BR: automoc4
+
+* Sun Jun  5 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.7.0-2
 - Initial build for Vine Linux
 
 * Fri May 20 2011 Rex Dieter <rdieter@fedoraproject.org> 0.7.0-1

p/phonon/phonon-vl.spec

@@ -1,26 +1,28 @@
-%define qt4_ver 4.7.2
+%define qt4_ver 4.8.0
 # 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 _qt4_datadir %(pkg-config --variable datadir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix})
 
 %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.5.1
+Version: 4.6.0
 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.5.1/src/phonon-%{version}.tar.xz
+Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/4.6.0/src/phonon-%{version}.tar.xz
 
 Patch1: phonon-4.4.4-no_rpath.patch
-## Mandriva/upstreamable patches
-Patch53: phonon-4.3.50-phonon-allow-stop-empty-source.patch
+## upstreamable patches
+# phonon_backend ... could not be loaded
+# http://bugzilla.redhat.com/760039
+Patch50: phonon-4.5.57-plugindir.patch 
 
 ## Upstream patches
 
@@ -34,6 +36,7 @@ BuildRequires: libqzeitgeist-devel
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: qt4-devel >= 4.6.0
+BuildRequires: openssl-devel
 BuildRequires: pulseaudio-libs-devel >= 0.9.15
 
 # TODO: enable the following Requires in next release
@@ -52,7 +55,7 @@ Summary: Development files for phonon
 Summary(ja): phonon の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: qt4-devel = %{_qt4_version}
+Requires: qt4-devel >= %{_qt4_version}
 
 %description devel
 Header files for developing applications using phonon
@@ -61,7 +64,7 @@ Header files for developing applications using phonon
 %setup -q
 
 %patch1 -p1 -b .no_rpath
-%patch53 -p1 -b .phonon-allow-stop-empty-source
+%patch50 -p1 -b .plugindir
 
 %build
 %ifarch x86_64
@@ -70,8 +73,8 @@ PATH="$PATH:`/usr/bin/pkg-config --variable=bindir Qt`"
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
 %cmake \
+    -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \
     ..
 popd
 
@@ -89,11 +92,6 @@ ln -s ../KDE/Phonon $RPM_BUILD_ROOT%{_includedir}/phonon/Phonon
 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}
-ln -sf %{_includedir}/phonon phonon
-popd
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -116,13 +114,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/KDE
 %{_includedir}/KDE/Phonon/
 %{_includedir}/phonon/
-%{_qt4_headerdir}/phonon
-%{_qt4_prefix}/mkspecs/modules/qt_phonon.pri
 %{_libdir}/*.so
+%dir %{_libdir}/cmake/
+%{_libdir}/cmake/phonon/
 %{_libdir}/pkgconfig/*.pc
-%{_datadir}/phonon-buildsystem/
+%{_datadir}/phonon/buildsystem/
+%{_qt4_datadir}/mkspecs/modules/qt_phonon.pri
 
 %changelog
+* Sat Jan  7 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+
 * Sat Nov 26 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.1-1
 - new upstream release
 

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

@@ -1,14 +1,14 @@
 %define beta 3
 
-%define qt4_ver 4.7.2
+%define qt4_ver 4.8.0
 %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_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
 Name:       qca-ossl
 Summary:    OpenSSL plugin for the Qt Cryptographic Architecture v2
 Version:    2.0.0
-Release:    0.beta%{beta}.13%{?_dist_release}
+Release:    0.beta%{beta}.14%{?_dist_release}
 
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -23,7 +23,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 BuildRequires: qt4-devel
 BuildRequires: qca2-devel >= 2.0.0-1
 BuildRequires: openssl-devel >= 0.9.8
-Requires: qt4 = %{_qt4_version}
+Requires: qt4 >= %{_qt4_version}
 
 Provides:   qca2-ossl = %{version}-%{release}
 
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan  9 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.0.0-0.beta3.14
+- rebuilt with qt-4.8.0
+
 * Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.0.0-0.beta3.13
 - rebuilt with qt4-4.7.2
 

q/qca2/qca2-vl.spec

@@ -1,11 +1,9 @@
-%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_datadir %(pkg-config --variable datadir --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 
 Name:           qca2
 Summary:        Qt Cryptographic Architecture
 Version:        2.0.3
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -30,7 +28,7 @@ application!
 Summary:        Qt Cryptographic Architecture development files
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt4-devel = %{_qt4_version}
+Requires:       qt4-devel >= %{_qt4_version}
 
 %description    devel
 This packages contains the development files for QCA
@@ -39,7 +37,6 @@ This packages contains the development files for QCA
 %setup -q -n qca-%{version}
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
 MAKE=%{_bindir}/make \
 ./configure \
   --prefix=%{_prefix} \
@@ -79,10 +76,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/qca2.pc
 %{_libdir}/libqca.prl
-%{_qt4_prefix}/mkspecs/features/crypto.prf
+%{_qt4_datadir}/mkspecs/features/crypto.prf
 
 
 %changelog
+* Sun Jan  8 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.0.3-3
+- rebuilt with qt-4.8.0
+
 * Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.0.3-2
 - rebuilt with qt-4.7.2
 

q/qoauth/qoauth-vl.spec

@@ -2,14 +2,14 @@
 %global gitdate 20100625
 #global posttag .%{?gitdate}git%{?githash}
 
-%define qt4_ver 4.7.2
+%define qt4_ver 4.8.0
 %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_datadir %(pkg-config --variable datadir --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 
 Name:		qoauth
 Summary:	Qt-based C++ library for OAuth authorization scheme
 Version:	1.0.1
-Release:	3%{?_dist_release}
+Release:	4%{?_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 = %{_qt4_version}
+Requires:	qt4-devel >= %{_qt4_version}
 Requires:	qca2-devel
 
 %description devel
@@ -79,11 +79,14 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 %{_libdir}/*.prl
 %{_libdir}/pkgconfig/*.pc
-%{_qt4_prefix}/mkspecs/features/*.prf
+%{_qt4_datadir}/mkspecs/features/*.prf
 %{_includedir}/*
 
 %changelog
-* Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-2
+* Mon Jan  9 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-4
+- rebuilt with qt-4.8.0
+
+* Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-3
 - rebuilt with qt4-4.7.2
 
 * Thu Jan 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-2

q/qscintilla/qscintilla-vl.spec

@@ -1,22 +1,18 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%global pyqt4_version 4.8
+%global pyqt4_version 4.9
 
-%define ver 1.78
+%define ver 2.29
 
-%define _qt4_version 4.7.2
-%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{_qt4_version})
-%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_version 4.8.0
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
+%define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_libdir})
+%define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_includedir})
 %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_version})
-%global qtinc	%{qtdir}/include
-%global qtlib	%{qtdir}/lib
-
 Summary:	A Scintilla port to Qt
 Name:		qscintilla
-Version:	2.4.6
-Release:	2%{?_dist_release}
+Version:	2.6
+Release:	1%{?_dist_release}
 
 # matches up (pretty much) with qt4
 License:	GPLv3 or GPLv2 with exceptions
@@ -30,7 +26,7 @@ Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	qt4-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
-Requires:	qt4 = %{_qt4_version}
+Requires:	qt4 >= %{_qt4_version}
 
 %description
 QScintilla is a port of Scintilla to the Qt GUI toolkit.
@@ -49,8 +45,8 @@ Requires: qt4-designer
 %package devel
 Summary: QScintilla Development Files
 Group: Development/Libraries
-Requires: %{name} = %{version}
-Requires: qt4-devel = %{_qt4_version}
+Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel >= %{_qt4_version}
 
 %description  devel
 This packages contains the libraries, include and other files
@@ -69,7 +65,7 @@ Requires: PyQt4 >= %{pyqt4_version}
 Summary:  Development files for QScintilla PyQt4 bindings 
 Group:    Development/Libraries
 Requires: %{name}-python = %{version}-%{release}
-Requires: PyQt4-devel
+Requires: PyQt4-devel >= %{pyqt4_version}
 
 %description python-devel
 %{summary}.
@@ -140,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root, -)
-%{_qt4_includedir}/*
+%{_qt4_headerdir}/*
 %{_qt4_libdir}/libqscintilla2.so
 
 %files python
@@ -152,6 +148,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sip/PyQt4/Qsci
 
 %changelog
+* Sat Jan  7 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.6-1
+- new upstream release
+- built with qt-4.8.0, PyQt4-4.9
+
 * Sun Mar 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.4.6-2
 - rebuilt with qt-4.7.2
 

q/qt-assistant-adp/qt-assistant-adp-vl.spec

@@ -1,7 +1,7 @@
 Name:    qt-assistant-adp
 Summary: Compatibility version of Qt Assistant
 Version: 4.6.3
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 
 Group: System Environment/Libraries
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@@ -18,7 +18,6 @@ Patch1: 01_build_system.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: qt4-devel >= 4.7.2-2%{?_dist_release}
-Requires: qt4 = %{_qt4_version}
 
 %description
 The old version of Qt Assistant, based on Assistant Document Profile (.adp)
@@ -28,12 +27,11 @@ applications providing help in that format.
 New applications should use the new version of Qt Assistant introduced in Qt
 4.4, based on the Qt Help Framework also introduced in Qt 4.4, instead.
 
-
 %package devel
 Summary: Development files for the compatibility QAssistantClient
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: qt4-devel = %{_qt4_version}
+Requires: qt4-devel
 
 %description devel
 This package contains the files necessary to build applications using the
@@ -71,38 +69,38 @@ cd ..
 
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 # install assistant_adp
-make install INSTALL_ROOT=%{buildroot}
+make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # install libQtAssistantClient
-make install INSTALL_ROOT=%{buildroot} -C lib
+make install INSTALL_ROOT=$RPM_BUILD_ROOT -C lib
 
 # install assistant_adp translations
-mkdir -p %{buildroot}%{_qt4_translationdir}
+mkdir -p $RPM_BUILD_ROOT%{_qt4_translationdir}
 install -p -m644 translations/assistant_adp_*.qm \
-                 %{buildroot}%{_qt4_translationdir}/
+                 $RPM_BUILD_ROOT%{_qt4_translationdir}/
 
 # install assistant.prf mkspec
 install -D -p -m644 features/assistant.prf \
-                    %{buildroot}%{_qt4_datadir}/mkspecs/features/assistant.prf
+                    $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features/assistant.prf
 
 # install missing headers (thanks to Fathi Boudra from Debian)
-install -p -m644 include/Q* %{buildroot}%{_qt4_headerdir}/QtAssistant/
+install -p -m644 include/Q* $RPM_BUILD_ROOT%{_qt4_headerdir}/QtAssistant/
 
 # nuke dangling reference(s) to the buildroot
-sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
+sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" $RPM_BUILD_ROOT%{_qt4_libdir}/*.prl
 
 # let rpm handle binaries conflicts
-mkdir %{buildroot}%{_bindir}
-pushd %{buildroot}%{_qt4_bindir}
+mkdir $RPM_BUILD_ROOT%{_bindir}
+pushd $RPM_BUILD_ROOT%{_qt4_bindir}
 mv assistant_adp ../../../bin/
 ln -s ../../../bin/assistant_adp .
 popd
 
 # _debug target (see bug #196513)
-pushd %{buildroot}%{_qt4_libdir}
+pushd $RPM_BUILD_ROOT%{_qt4_libdir}
 echo "INPUT(-lQtAssistantClient)" >libQtAssistantClient_debug.so
 popd
 
@@ -115,11 +113,8 @@ popd
 
 %find_lang assistant_adp --with-qt --without-mo
 
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mv $RPM_BUILD_ROOT%{_qt4_libdir}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
-
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -144,6 +139,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jan 07 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.3-5
+- rebuilt with qt-4.8.0
+
 * Sat Apr 09 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.3-4
 - fixed BR
 

q/qtsoap/qtsoap-vl.spec

@@ -1,12 +1,12 @@
-%define _qt4_ver 4.7.2
+%define _qt4_ver 4.8.0
 %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_version})
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
 Name:           qtsoap
 Summary:        The Simple Object Access Protocol Qt-based client side library
 Version:        2.7
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2 with exceptions or GPLv3
@@ -25,9 +25,10 @@ services and get responses from Qt-based applications.
 
 %package        devel
 Summary:        Development files for %{name}
+Summary(ja):    %{name} の開発用ファイル
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt4-devel = %{_qt4_version}
+Requires:       qt4-devel >= %{_qt4_version}
 
 %description    devel
 Development files for %{name}.
@@ -77,6 +78,9 @@ rm -rf %{buildroot}
 %{_qt4_headerdir}/QtSoap/
 
 %changelog
+* Sun Jan  8 2012 Ryoiochi INAGAKI <ryo1@bc.wakwak.com> - 2.7-4
+- rebuilt with qt-4.8.0
+
 * Sat Jul 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.7-3
 - Initial build for Vine Linux
 
@@ -87,4 +91,4 @@ rm -rf %{buildroot}
 - fix version
 
 * Tue Oct 26 2010 Jaroslav Reznik <jreznik@redhat.com> - 1.7-1
-- Initial spec file
+- Initial spec file

u/uim/uim-vl.spec

@@ -10,7 +10,7 @@
 %define with_canna	0
 
 %define qt3_ver 3.3.8
-%define qt4_ver 4.7.2
+%define qt4_ver 4.8.0
 # Qt3 version auto-detection -- inagaki
 %define _qt3_version %(pkg-config --modversion --silence-errors qt-mt 2>/dev/null || echo %{qt3_ver})
 %define _qt3_prefix  %{_libdir}/qt-%{_qt3_version}
@@ -20,7 +20,7 @@
 %bcond_without qt4
 # Qt4 version auto-detection -- inagaki
 %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_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
 #%%define extraver beta
@@ -29,7 +29,7 @@ Name: uim
 Summary: Uim an input method library
 Summary(ja): 入力メソッドライブラリ
 Version: 1.7.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: LGPLv2/BSD
 Group: System Environment/Libraries
@@ -794,6 +794,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Jan  7 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.7.1-2
+- rebuilt with qt4-4.8.0
+
 * Sun Aug 21 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.7.1-1
 - new upstream release
 - built with gtk3 and GNOME3