SHA256
1
0
forked from pool/fcitx

Accepting request 725322 from home:cgiboudeaux:noqt4

Stop packaging the fcitx-qt4 subpackage for leap 15.2 and tumbleweed.

OBS-URL: https://build.opensuse.org/request/show/725322
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=154
This commit is contained in:
Takashi Iwai 2019-08-26 05:37:38 +00:00 committed by Git OBS Bridge
parent 4b350b6bbb
commit e9661920e2
2 changed files with 53 additions and 66 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 22 13:13:21 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
- Stop packaging fcitx-qt4 for leap 15.2 and Tumbleweed.
- Run spec-cleaner
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 29 07:29:52 UTC 2018 - i@marguerite.su Thu Mar 29 07:29:52 UTC 2018 - i@marguerite.su

View File

@ -1,7 +1,7 @@
# #
# spec file for package fcitx # spec file for package fcitx
# #
# 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,19 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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/
# #
%define libver -4_2_9 %define libver -4_2_9
Name: fcitx Name: fcitx
Version: 4.2.9.6 Version: 4.2.9.6
Release: 0 Release: 0
Summary: Flexible Context-aware Input Tool with eXtension Summary: Flexible Context-aware Input Tool with eXtension
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/I18n/Chinese Group: System/I18n/Chinese
Url: https://github.com/fcitx/fcitx URL: https://github.com/fcitx/fcitx
Source: https://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz Source: https://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz
Source1: xim.d-fcitx Source1: xim.d-fcitx
Source2: fcitx-README.suse Source2: fcitx-README.suse
@ -51,31 +50,35 @@ BuildRequires: hicolor-icon-theme
BuildRequires: iso-codes-devel BuildRequires: iso-codes-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: libpresage-devel BuildRequires: libpresage-devel
# Only for leap < 15.2
%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
%endif
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: opencc-devel BuildRequires: opencc-devel
BuildRequires: pango-devel BuildRequires: pango-devel
BuildRequires: pkg-config BuildRequires: pkgconfig
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0 BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xkbfile)
Requires: %{name}-branding = %{version}
Requires: %{name}-gtk3 = %{version}-%{release} Requires: %{name}-gtk3 = %{version}-%{release}
Requires: lib%{name}%{libver} = %{version}-%{release} Requires: lib%{name}%{libver} = %{version}-%{release}
Recommends: %{name}-gtk2 = %{version}-%{release} Recommends: %{name}-gtk2 = %{version}-%{release}
Recommends: %{name}-qt4 = %{version}-%{release}
Recommends: %{name}-pinyin = %{version}-%{release} Recommends: %{name}-pinyin = %{version}-%{release}
Recommends: %{name}-table = %{version}-%{release} Recommends: %{name}-table = %{version}-%{release}
%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
Recommends: %{name}-qt4 = %{version}-%{release}
%endif
# These libraries are dlopen-ed in fcitx at runtime # These libraries are dlopen-ed in fcitx at runtime
# for spell-checking for keyboard users. ld can't find # for spell-checking for keyboard users. ld can't find
# them, so explicitly recommends. # them, so explicitly recommends.
Recommends: libenchant1
Recommends: libopencc2 Recommends: libopencc2
Recommends: libpresage1 Recommends: libpresage1
Recommends: libenchant1
Requires: %{name}-branding = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: locale(ko;zh_CN;zh_SG) Provides: locale(ko;zh_CN;zh_SG)
%description %description
@ -98,12 +101,12 @@ Requires: %{name} = %{version}-%{release}
%description devel %description devel
Development header files for Fcitx input method framework. Development header files for Fcitx input method framework.
%package gtk2 %package gtk2
Summary: Gtk2 IM module for %{name} Summary: Gtk2 IM module for %{name}
Group: System/I18n/Chinese Group: System/I18n/Chinese
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%gtk2_immodule_requires %{gtk2_immodule_requires}
%description gtk2 %description gtk2
GTK+ version 2 input module for Fcitx input method rfamework. GTK+ version 2 input module for Fcitx input method rfamework.
@ -112,7 +115,7 @@ GTK+ version 2 input module for Fcitx input method rfamework.
Summary: Gtk3 IM module for %{name} Summary: Gtk3 IM module for %{name}
Group: System/I18n/Chinese Group: System/I18n/Chinese
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%gtk3_immodule_requires %{gtk3_immodule_requires}
%description gtk3 %description gtk3
GTK+ version 3 input module for Fcitx input method framework. GTK+ version 3 input module for Fcitx input method framework.
@ -127,6 +130,7 @@ Pinyin and QuWei input methods. It's flexible and fast.
This package provides the GObject Introspection bindings for Fcitx. This package provides the GObject Introspection bindings for Fcitx.
%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
%package qt4 %package qt4
Summary: Qt4 IM module for %{name} Summary: Qt4 IM module for %{name}
Group: System/I18n/Chinese Group: System/I18n/Chinese
@ -134,6 +138,7 @@ Requires: %{name} = %{version}-%{release}
%description qt4 %description qt4
QT4 input module for Fcitx input method framework. QT4 input module for Fcitx input method framework.
%endif
%package quwei %package quwei
Summary: Chinese Zone-bit(QuWei) engine for %{name} Summary: Chinese Zone-bit(QuWei) engine for %{name}
@ -209,8 +214,8 @@ Fcitx Evening Breeze (Wan feng) input tables for Simplified Chinese.
%package table-cn-wubi-pinyin %package table-cn-wubi-pinyin
Summary: Wubi and pinyin(wubi-pinyin) table for %{name} Summary: Wubi and pinyin(wubi-pinyin) table for %{name}
Group: System/I18n/Chinese Group: System/I18n/Chinese
Provides: locale(fcitx-table:zh_CN;)
Requires: %{name}-table = %{version}-%{release} Requires: %{name}-table = %{version}-%{release}
Provides: locale(fcitx-table:zh_CN;)
BuildArch: noarch BuildArch: noarch
%description table-cn-wubi-pinyin %description table-cn-wubi-pinyin
@ -221,8 +226,8 @@ Wubi in Fcitx is based on wubi x86.
%package table-cn-wubi %package table-cn-wubi
Summary: Wubi table for %{name} Summary: Wubi table for %{name}
Group: System/I18n/Chinese Group: System/I18n/Chinese
Provides: locale(fcitx-table:zh_CN;)
Requires: %{name}-table = %{version}-%{release} Requires: %{name}-table = %{version}-%{release}
Provides: locale(fcitx-table:zh_CN;)
BuildArch: noarch BuildArch: noarch
%description table-cn-wubi %description table-cn-wubi
@ -261,10 +266,10 @@ Tools to convert txt or scel(sougou pinyin data format) pinyin sheets to fcitx m
Summary: openSUSE default Skins for Fcitx Summary: openSUSE default Skins for Fcitx
Group: System/I18n/Chinese Group: System/I18n/Chinese
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
BuildArch: noarch Supplements: (%{name} and branding-openSUSE)
Conflicts: %{name}-branding
Provides: %{name}-branding = %{version} Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding) BuildArch: noarch
Supplements: packageand(%{name}:branding-openSUSE)
%description branding-openSUSE %description branding-openSUSE
openSUSE default skins for Fcitx openSUSE default skins for Fcitx
@ -305,9 +310,8 @@ Fcitx dark skin.
You can either use this package for download from kde-look.org using knewstaff in fcitx-config-kde4. You can either use this package for download from kde-look.org using knewstaff in fcitx-config-kde4.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
@ -317,15 +321,15 @@ cd build
# fix dlopen-ed library name # fix dlopen-ed library name
cmake .. \ cmake .. \
-DCMAKE_C_FLAGS="$RPM_OPT_FLAGS" \ -DCMAKE_C_FLAGS="%{optflags}" \
-DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" \ -DCMAKE_CXX_FLAGS="%{optflags}" \
-DCMAKE_VERBOSE_MAKEFILE=On \ -DCMAKE_VERBOSE_MAKEFILE=On \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DOPENCC_LIBRARY_FILENAME=libopencc.so.2 \ -DOPENCC_LIBRARY_FILENAME=libopencc.so.2 \
-DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \ -DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \
-DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \ -DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \
-DENABLE_GTK3_IM_MODULE=On \ -DENABLE_GTK3_IM_MODULE=On \
%if 0%{?sles_version} %if 0%{?sles_version} || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
-DENABLE_QT=Off \ -DENABLE_QT=Off \
-DENABLE_QT_IM_MODULE=off \ -DENABLE_QT_IM_MODULE=off \
%endif %endif
@ -336,11 +340,11 @@ cmake .. \
# fix gobject-introspection build # fix gobject-introspection build
export SUSE_ASNEEDED=0 export SUSE_ASNEEDED=0
make make %{?_smp_mflags}
%install %install
cd build cd build
%makeinstall %make_install
cd .. cd ..
# install openSUSE skins # install openSUSE skins
@ -368,7 +372,7 @@ cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/
# create autostart # create autostart
mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
install -m 644 %{S:1} %{buildroot}%{_sysconfdir}/X11/xim.d/fcitx install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xim.d/fcitx
priority=30 priority=30
pushd %{buildroot}%{_sysconfdir}/X11/xim.d/ pushd %{buildroot}%{_sysconfdir}/X11/xim.d/
@ -386,30 +390,30 @@ popd
install -D -m644 %{SOURCE9} %{buildroot}%{_sysconfdir}/rpm/macros.%{name} install -D -m644 %{SOURCE9} %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
# remove *.la # remove *.la
%{__rm} -rf %{buildroot}%{_libdir}/lib%{name}-config.la rm -rf %{buildroot}%{_libdir}/lib%{name}-config.la
%find_lang %{name} %find_lang %{name}
%fdupes %{buildroot} %fdupes %{buildroot}
%post gtk2 %post gtk2
%gtk2_immodule_post %{gtk2_immodule_post}
%postun gtk2 %postun gtk2
%gtk2_immodule_postun %{gtk2_immodule_postun}
%post gtk3 %post gtk3
%gtk3_immodule_post %{gtk3_immodule_post}
# Add fcitx icons to gnome3 panel # Add fcitx icons to gnome3 panel
TARGET="/usr/share/gnome-shell/js/ui/statusIconDispatcher.js" TARGET="%{_datadir}/gnome-shell/js/ui/statusIconDispatcher.js"
if [ -f $TARGET ] && [ ! -f $TARGET-fcitx ] ; then if [ -f $TARGET ] && [ ! -f $TARGET-fcitx ] ; then
mv $TARGET $TARGET-fcitx mv $TARGET $TARGET-fcitx
sed "/^const STANDARD_TRAY_ICON_IMPLEMENTATIONS/a \ 'fcitx': 'input-method'," $TARGET-fcitx > $TARGET sed "/^const STANDARD_TRAY_ICON_IMPLEMENTATIONS/a \ 'fcitx': 'input-method'," $TARGET-fcitx > $TARGET
fi fi
%postun gtk3 %postun gtk3
%gtk3_immodule_postun %{gtk3_immodule_postun}
%post %post
%desktop_database_post %desktop_database_post
@ -422,11 +426,9 @@ exit 0
exit 0 exit 0
%post -n lib%{name}%{libver} -p /sbin/ldconfig %post -n lib%{name}%{libver} -p /sbin/ldconfig
%postun -n lib%{name}%{libver} -p /sbin/ldconfig %postun -n lib%{name}%{libver} -p /sbin/ldconfig
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root)
%license COPYING %license COPYING
%{_bindir}/%{name} %{_bindir}/%{name}
%{_bindir}/%{name}-autostart %{_bindir}/%{name}-autostart
@ -440,8 +442,8 @@ exit 0
%{_datadir}/icons/* %{_datadir}/icons/*
%{_datadir}/mime/packages/* %{_datadir}/mime/packages/*
%{_datadir}/dbus-1/services/org.fcitx.Fcitx.service %{_datadir}/dbus-1/services/org.fcitx.Fcitx.service
%{_mandir}/man1/fcitx.1.gz %{_mandir}/man1/fcitx.1%{?ext_man}
%{_mandir}/man1/fcitx-remote.1.gz %{_mandir}/man1/fcitx-remote.1%{?ext_man}
%{_libdir}/%{name}/ %{_libdir}/%{name}/
%{_sysconfdir}/xdg/autostart/%{name}*.desktop %{_sysconfdir}/xdg/autostart/%{name}*.desktop
%config %{_sysconfdir}/X11/xim.d/ %config %{_sysconfdir}/X11/xim.d/
@ -470,30 +472,24 @@ exit 0
%exclude %{_datadir}/%{name}/skin/dark %exclude %{_datadir}/%{name}/skin/dark
%files -n lib%{name}%{libver} %files -n lib%{name}%{libver}
%defattr(-,root,root)
%{_libdir}/libfcitx*.so.* %{_libdir}/libfcitx*.so.*
%{_libdir}/libfcitx*.so %{_libdir}/libfcitx*.so
%files gtk2 %files gtk2
%defattr(-,root,root)
%{_libdir}/gtk-2.0/* %{_libdir}/gtk-2.0/*
%files gtk3 %files gtk3
%defattr(-,root,root)
%{_libdir}/gtk-3.0/* %{_libdir}/gtk-3.0/*
%files -n typelib-1_0-Fcitx-1_0 %files -n typelib-1_0-Fcitx-1_0
%defattr(-,root,root)
%{_libdir}/girepository-1.0/Fcitx-1.0.typelib %{_libdir}/girepository-1.0/Fcitx-1.0.typelib
%files quwei %files quwei
%defattr(-,root,root)
%{_libdir}/%{name}/%{name}-qw.so %{_libdir}/%{name}/%{name}-qw.so
%{_datadir}/%{name}/inputmethod/qw.conf %{_datadir}/%{name}/inputmethod/qw.conf
%{_datadir}/%{name}/addon/%{name}-qw.conf %{_datadir}/%{name}/addon/%{name}-qw.conf
%files pinyin %files pinyin
%defattr(-,root,root)
%{_libdir}/%{name}/%{name}-pinyin.so %{_libdir}/%{name}/%{name}-pinyin.so
%{_datadir}/%{name}/pinyin/ %{_datadir}/%{name}/pinyin/
%{_datadir}/%{name}/inputmethod/pinyin.conf %{_datadir}/%{name}/inputmethod/pinyin.conf
@ -504,87 +500,71 @@ exit 0
%{_datadir}/%{name}/configdesc/%{name}-pinyin.desc %{_datadir}/%{name}/configdesc/%{name}-pinyin.desc
%files table %files table
%defattr(-,root,root)
%{_libdir}/%{name}/%{name}-table.so %{_libdir}/%{name}/%{name}-table.so
%{_datadir}/%{name}/addon/%{name}-table.conf %{_datadir}/%{name}/addon/%{name}-table.conf
%{_datadir}/%{name}/configdesc/table.desc %{_datadir}/%{name}/configdesc/table.desc
%files table-cn-cangjie %files table-cn-cangjie
%defattr(-,root,root)
%{_datadir}/%{name}/table/cangjie.* %{_datadir}/%{name}/table/cangjie.*
%{_datadir}/%{name}/imicon/cangjie.png %{_datadir}/%{name}/imicon/cangjie.png
%files table-cn-dianbao %files table-cn-dianbao
%defattr(-,root,root)
%{_datadir}/%{name}/table/db.* %{_datadir}/%{name}/table/db.*
%files table-cn-erbi %files table-cn-erbi
%defattr(-,root,root)
%{_datadir}/%{name}/table/erbi.* %{_datadir}/%{name}/table/erbi.*
%{_datadir}/%{name}/imicon/erbi.png %{_datadir}/%{name}/imicon/erbi.png
%files table-cn-bingchan %files table-cn-bingchan
%defattr(-,root,root)
%{_datadir}/%{name}/table/qxm.* %{_datadir}/%{name}/table/qxm.*
%files table-cn-wanfeng %files table-cn-wanfeng
%defattr(-,root,root)
%{_datadir}/%{name}/table/wanfeng.* %{_datadir}/%{name}/table/wanfeng.*
%files table-cn-wubi-pinyin %files table-cn-wubi-pinyin
%defattr(-,root,root)
%{_datadir}/%{name}/table/wbpy.* %{_datadir}/%{name}/table/wbpy.*
%{_datadir}/%{name}/imicon/wbpy.png %{_datadir}/%{name}/imicon/wbpy.png
%files table-cn-wubi %files table-cn-wubi
%defattr(-,root,root)
%{_datadir}/%{name}/table/wbx.* %{_datadir}/%{name}/table/wbx.*
%{_datadir}/%{name}/imicon/wubi.png %{_datadir}/%{name}/imicon/wubi.png
%files table-cn-ziran %files table-cn-ziran
%defattr(-,root,root)
%{_datadir}/%{name}/table/zrm.* %{_datadir}/%{name}/table/zrm.*
%{_datadir}/%{name}/imicon/ziranma.png %{_datadir}/%{name}/imicon/ziranma.png
%files table-tools %files table-tools
%defattr(-,root,root)
%{_bindir}/mb2txt %{_bindir}/mb2txt
%{_bindir}/txt2mb %{_bindir}/txt2mb
%{_mandir}/man1/mb2txt.1.gz %{_mandir}/man1/mb2txt.1%{?ext_man}
%{_mandir}/man1/txt2mb.1.gz %{_mandir}/man1/txt2mb.1%{?ext_man}
%files pinyin-tools %files pinyin-tools
%defattr(-,root,root)
%{_bindir}/createPYMB %{_bindir}/createPYMB
%{_bindir}/readPYMB %{_bindir}/readPYMB
%{_bindir}/readPYBase %{_bindir}/readPYBase
%{_bindir}/mb2org %{_bindir}/mb2org
%{_bindir}/scel2org %{_bindir}/scel2org
%{_mandir}/man1/createPYMB.1.gz %{_mandir}/man1/createPYMB.1%{?ext_man}
%{_mandir}/man1/readPYMB.1.gz %{_mandir}/man1/readPYMB.1%{?ext_man}
%{_mandir}/man1/readPYBase.1.gz %{_mandir}/man1/readPYBase.1%{?ext_man}
%{_mandir}/man1/mb2org.1.gz %{_mandir}/man1/mb2org.1%{?ext_man}
%{_mandir}/man1/scel2org.1.gz %{_mandir}/man1/scel2org.1%{?ext_man}
%files branding-openSUSE %files branding-openSUSE
%defattr(-,root,root)
%{_datadir}/%{name}/skin/Harlequin %{_datadir}/%{name}/skin/Harlequin
%{_datadir}/%{name}/skin/Dartmouth %{_datadir}/%{name}/skin/Dartmouth
%files skin-new-air %files skin-new-air
%defattr(-,root,root)
%{_datadir}/%{name}/skin/NewAir %{_datadir}/%{name}/skin/NewAir
%files skin-classic %files skin-classic
%defattr(-,root,root)
%{_datadir}/%{name}/skin/classic %{_datadir}/%{name}/skin/classic
%files skin-dark %files skin-dark
%defattr(-,root,root)
%{_datadir}/%{name}/skin/dark %{_datadir}/%{name}/skin/dark
%files devel %files devel
%defattr(-,root,root)
%config %{_sysconfdir}/rpm/macros.%{name} %config %{_sysconfdir}/rpm/macros.%{name}
%{_includedir}/* %{_includedir}/*
%{_bindir}/%{name}4-config %{_bindir}/%{name}4-config
@ -595,8 +575,9 @@ exit 0
%{_datadir}/cmake/ %{_datadir}/cmake/
%{_datadir}/gir-1.0/Fcitx-1.0.gir %{_datadir}/gir-1.0/Fcitx-1.0.gir
%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
%files qt4 %files qt4
%defattr(-,root,root)
%{_libdir}/qt4/* %{_libdir}/qt4/*
%endif
%changelog %changelog