From 9d078e30fcf02caa6900bf92bc2108088946cb6d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Aug 02 2021 16:30:45 +0000 Subject: -qt5: move libmaliit-plugins, private qt5 deps, here drop explicit BR: make (pulled in by cmake) %files: minor cleanup --- diff --git a/maliit-framework.spec b/maliit-framework.spec index d2625bb..9fc6a55 100644 --- a/maliit-framework.spec +++ b/maliit-framework.spec @@ -1,6 +1,6 @@ Name: maliit-framework Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Input method framework License: LGPLv2 @@ -11,7 +11,6 @@ Source0: https://github.com/maliit/framework/archive/refs/tags/framework-% Patch0: maliit-framework-properly-search-for-qtwaylandscanner.patch BuildRequires: cmake -BuildRequires: make BuildRequires: gcc-c++ BuildRequires: doxygen @@ -26,9 +25,6 @@ BuildRequires: systemd-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-static -BuildRequires: qt5-qtbase-private-devel -#libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit) -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qtwayland-devel @@ -46,6 +42,12 @@ link currently uses D-Bus. %package qt5 Summary: Input method module for Qt 5 based on Maliit framework +## as of version 2.0.0 -- rdieter +# libQt5Gui.so.5(Qt_5.15.2_PRIVATE_API)(64bit) +# libQt5WaylandClient.so.5(Qt_5.15.2_PRIVATE_API)(64bit) +BuildRequires: qt5-qtbase-private-devel +#libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit) +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: %{name}%{?_isa} = %{version}-%{release} %description qt5 @@ -61,7 +63,8 @@ Input method module for GTK+ 3 based on Maliit framework. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} - +# libmaliit-plugins moved to -qt5 +Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %description devel Files for development with %{name}. @@ -80,9 +83,11 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %description examples This package contains tests and examples for %{name}. + %prep %autosetup -n framework-%{version} -p1 + %build %cmake -Denable-examples=ON \ -Denable-dbus-activation=ON \ @@ -90,22 +95,24 @@ This package contains tests and examples for %{name}. %cmake_build + %install %cmake_install + %ldconfig_scriptlets %files %license LICENSE.LGPL %doc README NEWS %{_bindir}/maliit-server -%{_libdir}/libmaliit-glib.so.2 -%{_libdir}/libmaliit-glib.so.2.0.0 -%{_libdir}/libmaliit-plugins.so.2 -%{_libdir}/libmaliit-plugins.so.2.0.0 +%{_libdir}/libmaliit-glib.so.2* %{_datadir}/dbus-1/services/org.maliit.server.service +%ldconfig_scriptlets qt5 + %files qt5 +%{_libdir}/libmaliit-plugins.so.2* %{_libdir}/qt5/plugins/platforminputcontexts/libmaliitplatforminputcontextplugin.so %{_libdir}/qt5/plugins/wayland-shell-integration/libinputpanel-shell.so @@ -128,7 +135,13 @@ This package contains tests and examples for %{name}. %files examples %{_bindir}/maliit-exampleapp-plainqt + %changelog +* Mon Aug 02 2021 Rex Dieter - 2.0.0-3 +- -qt5: move libmaliit-plugins, private qt5 deps, here +- drop explicit BR: make (pulled in by cmake) +- %%files: minor cleanup + * Thu Jul 22 2021 Fedora Release Engineering - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild