From 39486acfc68c198a35ff6fa786462b6ffbc29d47745c5352e048312fa5ee5a25 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 27 Feb 2018 13:25:08 +0000 Subject: [PATCH] Accepting request 580543 from home:dimstar:Factory - Add pkgconfig(xkbfile) BuildRequires: in the past, this used to be pulled in by libqt4, but since our own code depends on it, and not Qt4, it is our own duty to request our build dependencies. - Package COPYING is %license, not as %doc. Fixes the error seen in Staging:K - with the libqt4 changes prepared OBS-URL: https://build.opensuse.org/request/show/580543 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=149 --- fcitx.changes | 8 ++++++++ fcitx.spec | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/fcitx.changes b/fcitx.changes index e1369f7..d5f4217 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 27 09:34:05 UTC 2018 - dimstar@opensuse.org + +- Add pkgconfig(xkbfile) BuildRequires: in the past, this used to + be pulled in by libqt4, but since our own code depends on it, and + not Qt4, it is our own duty to request our build dependencies. +- Package COPYING is %license, not as %doc. + ------------------------------------------------------------------- Sat Nov 11 01:06:32 UTC 2017 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index bfd0836..8f4d931 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -1,7 +1,7 @@ # # spec file for package fcitx # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -22,7 +22,7 @@ Name: fcitx Version: 4.2.9.5 Release: 0 Summary: Flexible Context-aware Input Tool with eXtension -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/I18n/Chinese Url: http://code.google.com/p/fcitx Source: http://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz @@ -59,6 +59,7 @@ BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(xkbcommon) >= 0.5.0 +BuildRequires: pkgconfig(xkbfile) Requires: %{name}-gtk2 = %{version}-%{release} Requires: %{name}-gtk3 = %{version}-%{release} Requires: %{name}-qt4 = %{version}-%{release} @@ -361,7 +362,6 @@ cp -r %{SOURCE2} %{buildroot}%{_docdir}/%{name}/ cp -r %{SOURCE3} %{buildroot}%{_docdir}/%{name}/ cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/ cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/ -cp -r COPYING %{buildroot}%{_docdir}/%{name}/ # create autostart mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ @@ -424,6 +424,7 @@ exit 0 %files -f %{name}.lang %defattr(-,root,root) +%license COPYING %{_bindir}/%{name} %{_bindir}/%{name}-autostart %{_bindir}/%{name}-configtool