diff --git a/fcitx.changes b/fcitx.changes index b56e2ea..5b81fc5 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 11 18:03:21 UTC 2016 - i@marguerite.su + +- Due to changes in kdebase4-openSUSE in Tumbleweed + %{_kde4_appsdir}/desktoptheme/{openSUSE,openSUSElight} + are no longer available. Actually those icon tweaks + are not needed too. + ------------------------------------------------------------------- Tue Dec 22 15:35:41 UTC 2015 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index a173db4..df2a604 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -1,7 +1,7 @@ # # spec file for package fcitx # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -411,11 +411,13 @@ mv openSUSE-themes/Harlequin %{buildroot}%{_datadir}/%{name}/skin/ mv openSUSE-themes/Dartmouth %{buildroot}%{_datadir}/%{name}/skin/ mv openSUSE-themes/NewAir %{buildroot}%{_datadir}/%{name}/skin/ +%if 0%{?suse_version} <= 1320 # fcitx 4.2.8 use new dbus systray mechanism, so fix the ugly oxygen keyboard icon mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/ mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/ cp -r openSUSE-themes/input-Dartmouth.svgz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz cp -r openSUSE-themes/input-Harlequin.svgz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz +%endif # Change default skin pushd %{buildroot}%{_datadir}/%{name}/configdesc @@ -648,6 +650,7 @@ exit 0 %defattr(-,root,root) %{_datadir}/%{name}/skin/Harlequin %{_datadir}/%{name}/skin/Dartmouth +%if 0%{?suse_version} <= 1320 %{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz %{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz %if 0%{?suse_version} <= 1310 @@ -659,6 +662,7 @@ exit 0 %dir %{_kde4_appsdir}/desktoptheme/openSUSE/icons %endif %endif +%endif %files skin-new-air %defattr(-,root,root)