From c30fed4ed0f22edd7a2c05331199ca88116510e7 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 25 Nov 2024 01:25:03 +0800 Subject: [PATCH] adopt to new cmake macro --- fcitx.spec | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/fcitx.spec b/fcitx.spec index e30c619..adb036e 100755 --- a/fcitx.spec +++ b/fcitx.spec @@ -5,12 +5,12 @@ Name: fcitx Summary: An input method framework Version: 4.2.9.7 -Release: 3 -License: GPLv2+ +Release: 4 +License: GPL-2.0-or-later URL: https://fcitx-im.org/wiki/Fcitx -Source0: http://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz +Source0: https://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz Source1: xinput-%{name} -BuildRequires: gcc-c++, pango-devel, dbus-devel, opencc-devel, wget, intltool, chrpath, opencc, cmake, libtool, doxygen, libicu-devel +BuildRequires: gcc-c++, pango-devel, dbus-devel, opencc-devel, wget, intltool, chrpath, opencc, cmake, libtool, doxygen BuildRequires: qt4-devel, gtk3-devel, gtk2-devel, libicu, xorg-x11-proto-devel, xorg-x11-xtrans-devel, gobject-introspection-devel, libxkbfile-devel, enchant-devel, iso-codes-devel, libicu-devel BuildRequires: libX11-devel, dbus-glib-devel, dbus-x11, desktop-file-utils, libxml2-devel, lua-devel, extra-cmake-modules, xkeyboard-config-devel, libuuid-devel, json-c-devel Requires: imsettings, imsettings-gnome, hicolor-icon-theme, dbus @@ -47,20 +47,14 @@ developing programs using Fcitx libraries. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 -n %{name}-%{version} %build -mkdir -p build -pushd build -%cmake .. -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On -DENABLE_LUA=On -DENABLE_GIR=On -DENABLE_XDGAUTOSTART=Off -make VERBOSE=1 %{?_smp_mflags} +%cmake -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On -DENABLE_LUA=On -DENABLE_GIR=On -DENABLE_XDGAUTOSTART=Off +%cmake_build %install -%make_install INSTALL="install -p" -C build - -find %{buildroot}%{_libdir} -name '*.la' -delete -print +%cmake_install install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf} @@ -95,9 +89,6 @@ if [ "$1" = "0" ]; then [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || : fi -%ldconfig_scriptlets libs - - %files -f %{name}.lang %doc AUTHORS ChangeLog THANKS TODO %license COPYING @@ -197,6 +188,9 @@ fi %{_datadir}/gir-1.0/Fcitx-1.0.gir %changelog +* Wed Nov 20 2024 Funda Wang - 4.2.9.7-4 +- adopt to new cmake macro + * Thu Dec 21 2023 liuzhilin - 4.2.9.7-3 - hide fcitx from DDE -- Gitee