diff --git a/.gitignore b/.gitignore index 85fb87e..0082f4e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz /qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz /qtvirtualkeyboard-everywhere-src-5.12.4.tar.xz +/qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz diff --git a/qt5-qtvirtualkeyboard.spec b/qt5-qtvirtualkeyboard.spec index 1454493..6e2e2ca 100644 --- a/qt5-qtvirtualkeyboard.spec +++ b/qt5-qtvirtualkeyboard.spec @@ -2,8 +2,8 @@ Summary: Qt5 - VirtualKeyboard component Name: qt5-%{qt_module} -Version: 5.12.4 -Release: 1%{?dist} +Version: 5.11.1 +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -11,14 +11,15 @@ 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 -## upstreamable patches - BuildRequires: qt5-qtbase-devel >= %{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} + # version unknown Provides: bundled(libpinyin) @@ -37,13 +38,6 @@ 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} @@ -52,7 +46,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep -%autosetup -n %{qt_module}-everywhere-src-%{version} -p1 +%setup -q -n %{qt_module}-everywhere-src-%{version} %build @@ -65,64 +59,21 @@ 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/ - -%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 +%{_qt5_datadir}/qtvirtualkeyboard/ %files examples %{_qt5_examplesdir}/ %changelog -* 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 fb3fb45..5c4781f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtvirtualkeyboard-everywhere-src-5.12.4.tar.xz) = 04960c475a01f65901279fdab352742e4dc77753a306c7bd9996cf32be4a63524e7be034d60b398c6862c0099b02eedcef89f28fd09b1c7fa3075f89adba5a7a +SHA512 (qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz) = e3010450553cad42850b4cf1b07e157b30e9a6a74b8c551e21ab45a04da76e55e83c08b4421c081eda44e8928c8e0b69f9c8146855a4e02bbf3779f5a0e290d0