Hello community, here is the log from the commit of package kcm-fcitx for openSUSE:Factory checked in at 2015-06-06 09:54:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm-fcitx (Old) and /work/SRC/openSUSE:Factory/.kcm-fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kcm-fcitx" Changes: -------- --- /work/SRC/openSUSE:Factory/kcm-fcitx/kcm-fcitx.changes 2013-07-08 13:35:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcm-fcitx.new/kcm-fcitx.changes 2015-06-06 09:54:39.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 5 17:29:12 UTC 2015 - i@marguerite.su + +- split a new subpackage: fcitx-config-kde4-icons + * avoid file conflicts when fcitx-config-kde5 is also installed + * icons may be different later, but for now they're the same + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm-fcitx.spec ++++++ --- /var/tmp/diff_new_pack.Cr5IID/_old 2015-06-06 09:54:40.000000000 +0200 +++ /var/tmp/diff_new_pack.Cr5IID/_new 2015-06-06 09:54:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kcm-fcitx # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -30,7 +30,6 @@ Obsoletes: %{name} < 0.2.0 Provides: %{name} = %{version} BuildRequires: fcitx-devel -%if 0%{?suse_version} BuildRequires: libkde4-devel BuildRequires: rsvg-view %if 0%{?suse_version} <= 1140 @@ -38,18 +37,13 @@ %else BuildRequires: libunique1-devel %endif -%else -BuildRequires: kdelibs-devel -BuildRequires: libX11-devel -BuildRequires: librsvg2 -BuildRequires: unique-devel -%endif BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: libtool BuildRequires: xz +Requires: fcitx-kcm-icons = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,21 +54,28 @@ %package -n %{pkgname} Summary: KDE control module for Fcitx Group: System/I18n/Chinese -%if 0%{?suse_version} %kde4_runtime_requires %fcitx_requires Provides: locale(kdebase4:ko;zh_CN;zh_SG) Supplements: packageand(fcitx:kdebase4) -%else -Requires: kde-runtime -Requires: qt-x11 -%endif %description -n %{pkgname} KDE control module for Fcitx. You can config fcitx through "Configure Desktop" - "Locale" - Fcitx now. +%package -n %{pkgname}-icons +Summary: Keyboard icons for %{pkgname} +Group: System/I18n/Chinese +Requires: %{pkgname} = %{version} +Provides: fcitx-kcm-icons = %{version} +Conflicts: otherproviders(fcitx-kcm-icons) +Supplements: packageand(%{pkgname}:kdebase4-workspace-branding) +BuildArch: noarch + +%description -n %{pkgname}-icons +This package provides systemsetting icons for fcitx in kdebase4-workspace. + %prep %setup -q -n %{name}-%{version} @@ -103,9 +104,7 @@ %find_lang kcm_fcitx -%if 0%{?suse_version} %kde_post_install -%endif %post -n %{pkgname} -p /sbin/ldconfig @@ -114,12 +113,13 @@ %files -n %{pkgname} -f kcm_fcitx.lang %defattr(-,root,root,-) %{_bindir}/kbd-layout-viewer -%{_libdir}/kde4/* -%{_datadir}/kde4/* +%{_libdir}/kde4/kcm_fcitx.so +%{_datadir}/kde4/config/fcitx-skin.knsrc +%{_datadir}/kde4/services/kcm_fcitx.desktop %{_datadir}/applications/kde4/kbd-layout-viewer.desktop -%if 0%{?fedora_version} -%{_datadir}/config/fcitx-skin.knsrc -%endif + +%files -n %{pkgname}-icons +%defattr(-,root,root,-) %{_datadir}/icons/hicolor/*/devices/input-keyboard.png %changelog