From 6c0e9132bf355d9fd37936fafd9a2aadae42b1fbdbbdedbd139d2a1a9ed2042f Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Fri, 11 Dec 2020 13:56:15 +0000 Subject: [PATCH] Accepting request 854580 from home:alarrosa:branches:M17N - Do not build the qt4 subpackage for Leap 15.3 or newer (boo#1179613). OBS-URL: https://build.opensuse.org/request/show/854580 OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=63 --- uim.changes | 6 ++++++ uim.spec | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/uim.changes b/uim.changes index a3b2522..5b4b6f2 100644 --- a/uim.changes +++ b/uim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 10 13:35:33 UTC 2020 - Antonio Larrosa + +- Do not build the qt4 subpackage for Leap 15.3 or newer + (boo#1179613). + ------------------------------------------------------------------- Thu Nov 26 16:48:21 CET 2020 - tiwai@suse.de diff --git a/uim.spec b/uim.spec index 4e44406..bbc96b3 100644 --- a/uim.spec +++ b/uim.spec @@ -19,6 +19,7 @@ %if ! %{defined _distconfdir} %define _distconfdir %{_sysconfdir} %endif +%define build_qt4 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150300 Name: uim Version: 1.8.8 @@ -49,7 +50,7 @@ BuildRequires: perl-XML-Parser BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xemacs -%if 0%{?suse_version} <= 1500 +%if %{build_qt4} BuildRequires: libqt4-devel %endif BuildRequires: pkgconfig(Qt5X11Extras) @@ -91,7 +92,7 @@ Requires: %{name} = %{version} %description gtk3 Contains GTK+3.0 IM module for uim -%if 0%{?suse_version} <= 1500 +%if %{build_qt4} %package qt4 Summary: Qt4 input module plugin for uim Group: System/I18n/Japanese @@ -123,7 +124,7 @@ iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs --libexecdir=%{_prefix}/lib/uim \ --with-canna\ --with-anthy-utf8 \ -%if 0%{?suse_version} <= 1500 +%if %{build_qt4} --with-qt4 \ --with-qt4-immodule \ %endif @@ -256,7 +257,7 @@ uim-module-manager --register \ %{_prefix}/lib/uim/uim-*-gtk3 %{_libdir}/gtk-3*/*/immodules/*.so -%if 0%{?suse_version} <= 1500 +%if %{build_qt4} %files qt4 -f uim-chardict-qt.lang %{_bindir}/uim-*-qt4 %{_prefix}/lib/uim/uim-*-qt4