diff --git a/.gitignore b/.gitignore index 0082f4e..d089b75 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz /qtvirtualkeyboard-everywhere-src-5.12.4.tar.xz /qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz +/qtvirtualkeyboard-everywhere-src-5.12.8.tar.xz diff --git a/qt5-qtvirtualkeyboard.spec b/qt5-qtvirtualkeyboard.spec index 6e2e2ca..1f3c9a7 100644 --- a/qt5-qtvirtualkeyboard.spec +++ b/qt5-qtvirtualkeyboard.spec @@ -2,8 +2,8 @@ Summary: Qt5 - VirtualKeyboard component Name: qt5-%{qt_module} -Version: 5.11.1 -Release: 2%{?dist} +Version: 5.12.8 +Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -11,14 +11,13 @@ Url: http://qt.io %global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz -BuildRequires: qt5-qtbase-devel >= %{version} +## upstreamable patches + +BuildRequires: qt5-qtbase-devel >= %{_qt5_version} BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -BuildRequires: qt5-qtdeclarative-devel >= %{version} -BuildRequires: qt5-qtsvg-devel >= %{version} - -Obsoletes: qt5-qtvirtualkeyboard-devel < 5.7.1-4 -Provides: qt5-qtvirtualkeyboard-devel = %{version}-%{release} +BuildRequires: qt5-qtdeclarative-devel >= %{_qt5_version} +BuildRequires: qt5-qtsvg-devel >= %{_qt5_version} # version unknown Provides: bundled(libpinyin) @@ -38,6 +37,13 @@ for Qt 5. Key features include: * Handwriting support, with gestures for fullscreen input. * Audio feedback. +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} +%description devel +%{summary}. + %package examples Summary: Programming examples for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -46,7 +52,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep -%setup -q -n %{qt_module}-everywhere-src-%{version} +%autosetup -n %{qt_module}-everywhere-src-%{version} -p1 %build @@ -59,21 +65,73 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %install make install INSTALL_ROOT=%{buildroot} +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt5_libdir} +for prl_file in libQt5*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + %ldconfig_scriptlets %files %license LICENSE.* +%{_qt5_libdir}/libQt5VirtualKeyboard.so.5* %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QVirtualKeyboardPlugin.cmake %{_qt5_plugindir}/platforminputcontexts/libqtvirtualkeyboardplugin.so +%{_qt5_plugindir}/virtualkeyboard/ %{_qt5_qmldir}/QtQuick/VirtualKeyboard/ -%{_qt5_datadir}/qtvirtualkeyboard/ + +%files devel +%{_qt5_headerdir}/QtVirtualKeyboard/ +%{_qt5_libdir}/libQt5VirtualKeyboard.prl +%{_qt5_libdir}/libQt5VirtualKeyboard.so +%{_qt5_libdir}/cmake/Qt5VirtualKeyboard/ +%{_qt5_libdir}/pkgconfig/Qt5VirtualKeyboard.pc +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_virtualkeyboard*.pri %files examples %{_qt5_examplesdir}/ %changelog +* Thu Apr 30 2020 Troy Dawson - 5.12.8-1 +- 5.12.8 + +* Tue Sep 24 2019 Jan Grulich - 5.12.5-1 +- 5.12.5 + +* Fri Jul 26 2019 Fedora Release Engineering - 5.12.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jun 14 2019 Jan Grulich - 5.12.4-1 +- 5.12.4 + +* Tue Jun 04 2019 Jan Grulich - 5.12.3-1 +- 5.12.3 + +* Fri Feb 15 2019 Rex Dieter - 5.12.1-1 +- 5.12.1 +- restore -devel subpkg + +* Sat Feb 02 2019 Fedora Release Engineering - 5.11.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Dec 07 2018 Rex Dieter - 5.11.3-1 +- 5.11.3 + +* Wed Oct 24 2018 Rex Dieter - 5.11.2-2 +- do not log keypresses in release mode + +* Fri Sep 21 2018 Jan Grulich - 5.11.2-1 +- 5.11.2 + * Sat Jul 14 2018 Fedora Release Engineering - 5.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 5c4781f..acb76ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz) = e3010450553cad42850b4cf1b07e157b30e9a6a74b8c551e21ab45a04da76e55e83c08b4421c081eda44e8928c8e0b69f9c8146855a4e02bbf3779f5a0e290d0 +SHA512 (qtvirtualkeyboard-everywhere-src-5.12.8.tar.xz) = 938bfcdbe63354ee956cff2d3e40884c4cd531eb522cf2258d1ceb7de14e2aa4fb9dc43e2007fe99fae008e0161461347acb362a616b230ed8f1d9b77f3169a3