diff --git a/fcitx.changes b/fcitx.changes index 14b9f01..d18e9b4 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Nov 9 07:00:33 UTC 2014 - i@marguerite.su + +- update themes + * reworked Dartmouth & New Air + * added Harlequin +- droped input.svgz + * new input-Dartmouth/Harlequin.svgz are in openSUSE-themes.tar.gz + refers to Dark/Light versions of openSUSE + ------------------------------------------------------------------- Sat Sep 20 09:32:24 UTC 2014 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index e6712ab..92d5922 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -33,7 +33,6 @@ Source3: xim.fcitx.suse.template Source7: xinput-fcitx Source8: openSUSE-themes.tar.gz Source9: macros.%{name} -Source10: input.svgz Source99: baselibs.conf BuildRequires: cairo-devel %if 0%{?suse_version} @@ -324,7 +323,7 @@ Tools to convert txt or scel(sougou pinyin data format) pinyin sheets to fcitx m %if 0%{?suse_version} %package branding-openSUSE -Summary: openSUSE default Skin for Fcitx +Summary: openSUSE default Skins for Fcitx Group: System/I18n/Chinese Requires: %{name} = %{version}-%{release} %if 0%{?suse_version} >= 1140 @@ -335,7 +334,7 @@ Conflicts: otherproviders(%{name}-branding) Supplements: packageand(%{name}:branding-openSUSE) %description branding-openSUSE -openSUSE default skin for Fcitx +openSUSE default skins for Fcitx You can either use this package or download from kde-look.org using knewstaff in fcitx-config-kde4. @@ -433,20 +432,20 @@ cd .. %if 0%{?suse_version} # install openSUSE skins -pushd %{buildroot}%{_datadir}/%{name}/skin/ tar -xzf %{SOURCE8} -mv openSUSE-themes/Dartmouth ./openSUSE-default -mv openSUSE-themes/New_Air ./New_Air -rm -rf openSUSE-themes -popd +mv openSUSE-themes/Harlequin %{buildroot}%{_datadir}/%{name}/skin/ +mv openSUSE-themes/Dartmouth %{buildroot}%{_datadir}/%{name}/skin/ +mv openSUSE-themes/NewAir %{buildroot}%{_datadir}/%{name}/skin/ # fcitx 4.2.8 use new dbus systray mechanism, so fix the ugly oxygen keyboard icon mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/ -cp -r %{SOURCE10} %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/ +mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/ +cp -r openSUSE-themes/input-Harlequin.svgz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz +cp -r openSUSE-themes/input-Dartmouth.svgz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz # Change default skin pushd %{buildroot}%{_datadir}/%{name}/configdesc -sed -i 's/DefaultValue=default/DefaultValue=openSUSE-default/' %{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc +sed -i 's/DefaultValue=default/DefaultValue=Harlequin/' %{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc popd %endif @@ -625,8 +624,9 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %exclude %{_libdir}/%{name}/libexec/fcitx-po-parser %exclude %{_libdir}/%{name}/libexec/fcitx-scanner %if 0%{?suse_version} -%exclude %{_datadir}/%{name}/skin/openSUSE-default -%exclude %{_datadir}/%{name}/skin/New_Air +%exclude %{_datadir}/%{name}/skin/Harlequin +%exclude %{_datadir}/%{name}/skin/Dartmouth +%exclude %{_datadir}/%{name}/skin/NewAir %endif %exclude %{_datadir}/%{name}/skin/classic %exclude %{_datadir}/%{name}/skin/dark @@ -736,17 +736,23 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %files branding-openSUSE %defattr(-,root,root) -%{_datadir}/%{name}/skin/openSUSE-default +%{_datadir}/%{name}/skin/Harlequin +%{_datadir}/%{name}/skin/Dartmouth %{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz +%{_kde4_appsdir}/desktoptheme/openSUSElight/icons/input.svgz +%if 0%{?suse_version} <= 1310 +%dir %{_kde4_appsdir}/desktoptheme/openSUSElight +%dir %{_kde4_appsdir}/desktoptheme/openSUSElight/icons %if 0%{?suse_version} <= 1220 %dir %{_kde4_appsdir}/desktoptheme %dir %{_kde4_appsdir}/desktoptheme/openSUSE %dir %{_kde4_appsdir}/desktoptheme/openSUSE/icons %endif +%endif %files skin-new-air %defattr(-,root,root) -%{_datadir}/%{name}/skin/New_Air +%{_datadir}/%{name}/skin/NewAir %endif diff --git a/input.svgz b/input.svgz deleted file mode 100644 index 9da72e3..0000000 Binary files a/input.svgz and /dev/null differ diff --git a/openSUSE-themes.tar.gz b/openSUSE-themes.tar.gz index f14879c..c33277e 100644 --- a/openSUSE-themes.tar.gz +++ b/openSUSE-themes.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c2083e6b4c71461caae058f3c65459ee95cf7c0f42fb981eeafbde8301bfde3 -size 780402 +oid sha256:da53fd98d21546e3d9094bac0e4bc581d0039526fc85bec6cd4047f680a45bbf +size 1089588