From 647528bbba8c431240f74af76ae8795019c1313ef58fb5bed9459c41e003373d Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 28 Apr 2019 23:16:34 +0000 Subject: [PATCH] Accepting request 698922 from home:cgiboudeaux:noqt4 - Stop packaging the Qt4 frontend for openSUSE Factory. Qt4 is EOL and will be removed from future openSUSE releases. OBS-URL: https://build.opensuse.org/request/show/698922 OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=55 --- baselibs.conf | 5 +++++ uim.changes | 6 ++++++ uim.spec | 25 +++++++++++++++++-------- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 4514249..680b764 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,6 +2,8 @@ uim recommends "uim-gtk2- = " recommends "uim-gtk3- = " recommends "uim-qt4- = " + recommends "uim-qt5- = " + uim-gtk2 post "%if "%_lib" == "lib64"" post "%{_bindir}/gtk-query-immodules-2.0-64 --update-cache" @@ -31,3 +33,6 @@ uim-gtk3 uim-qt4 requires "uim- = " supplements "packageand(uim:libqt4-)" +uim-qt5 + requires "uim- = " + supplements "packageand(uim:libqt5-)" diff --git a/uim.changes b/uim.changes index 65cbca4..3ebedbc 100644 --- a/uim.changes +++ b/uim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Apr 13 13:31:32 UTC 2019 - Christophe Giboudeaux + +- Stop packaging the Qt4 frontend for openSUSE Factory. + Qt4 is EOL and will be removed from future openSUSE releases. + ------------------------------------------------------------------- Fri May 18 16:20:38 UTC 2018 - jengelh@inai.de diff --git a/uim.spec b/uim.spec index 3a4f0fd..e6017fe 100644 --- a/uim.spec +++ b/uim.spec @@ -1,7 +1,7 @@ # # spec file for package uim # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -34,7 +34,6 @@ BuildRequires: emacs-x11 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: intltool -BuildRequires: libqt4-devel BuildRequires: libqt5-qtbase-devel BuildRequires: libqt5-qtbase-private-headers-devel BuildRequires: m17n-lib-devel @@ -43,6 +42,9 @@ BuildRequires: perl-XML-Parser BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xemacs +%if 0%{?suse_version} <= 1500 +BuildRequires: libqt4-devel +%endif BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(anthy) BuildRequires: pkgconfig(expat) @@ -82,6 +84,7 @@ Requires: %{name} = %{version} %description gtk3 Contains GTK+3.0 IM module for uim +%if 0%{?suse_version} <= 1500 %package qt4 Summary: Qt4 input module plugin for uim Group: System/I18n/Japanese @@ -89,6 +92,7 @@ Requires: %{name} = %{version} %description qt4 Contains Qt4 input module plugin for uim +%endif %package qt5 Summary: Qt5 input module plugin for uim @@ -106,11 +110,13 @@ iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs %build %configure --disable-static \ - --libexecdir=%{_prefix}/lib/uim \ - --with-canna\ - --with-anthy-utf8 \ + --libexecdir=%{_prefix}/lib/uim \ + --with-canna\ + --with-anthy-utf8 \ +%if 0%{?suse_version} <= 1500 --with-qt4 \ - --with-qt4-immodule \ + --with-qt4-immodule \ +%endif --with-qt5 \ --with-qt5-immodule \ --enable-kde-applet @@ -191,7 +197,8 @@ uim-module-manager --register \ %gtk3_immodule_postun %files -f uim.lang -%doc AUTHORS COPYING NEWS* README* +%license COPYING +%doc AUTHORS NEWS* README* %doc doc %dir %{_sysconfdir}/X11/xim.d/ %{_sysconfdir}/X11/xim.d/* @@ -240,10 +247,12 @@ uim-module-manager --register \ %{_prefix}/lib/uim/uim-*-gtk3 %{_libdir}/gtk-3*/*/immodules/*.so +%if 0%{?suse_version} <= 1500 %files qt4 -f uim-chardict-qt.lang %{_bindir}/uim-*-qt4 %{_prefix}/lib/uim/uim-*-qt4 %{_libdir}/qt4/plugins/inputmethods/*.so +%endif %files qt5 -f uim-chardict-qt.lang %{_bindir}/uim-*-qt5