Accepting request 131604 from home:MargueriteSu:branches:M17N

OBS-URL: https://build.opensuse.org/request/show/131604
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=41

fcitx.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Aug 26 01:15:41 UTC 2012 - i@marguerite.su
+
+- add openSUSE-branding theme for 12.2
+
 -------------------------------------------------------------------
 Thu Aug 16 22:34:07 UTC 2012 - i@marguerite.su
 

fcitx.spec

@@ -35,6 +35,7 @@ Source5:        pinyin.tar.gz
 Source6:        table.tar.gz
 # for fedora auto-start
 Source7:        xinput-fcitx
+SOurce8:        openSUSE-default.tar.gz
 #FIX-FOR-UPSTREAM i@marguerite.su - dont download online
 Patch1:         fix_fcitx_googlecode_resolv_error.patch
 BuildRequires:  cairo-devel
@@ -86,6 +87,7 @@ Requires:       %{name}-qt4 = %{version}-%{release}
 %if 0%{?suse_version}
 Recommends:       %{name}-pinyin = %{version}-%{release}
 Recommends:       %{name}-table = %{version}-%{release}
+Recommends:       %{name}-branding-openSUSE = %{version}
 %endif
 %if 0%{?fedora_version}
 Requires(post):		%{_sbindir}/alternatives
@@ -306,6 +308,36 @@ Requires:      lib%{name}%{libver} = %{version}-%{release}
 %description pinyin-tools
 Tools to convert txt or scel(sougou pinyin data format) pinyin sheets to fcitx match lists.
 
+%package branding-openSUSE
+Summary:       openSUSE default Skin for Fcitx
+Group:         System/I18n/Chinese
+Requires:      %{name} = %{version}-%{release}
+%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
+BuildArch:     noarch
+%endif
+Provides:      fcitx-branding = %{version}
+Conflicts:     otherproviders(fcitx-branding)
+
+%description branding-openSUSE
+openSUSE default skin for Fcitx
+
+You can either use this package or download from kde-look.org using knewstaff in fcitx-config-kde4.
+
+%package branding-upstream
+Summary:       Fcitx Upstream default Skin
+Group:         System/I18n/Chinese
+Requires:      %{name} = %{version}-%{release}
+%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
+BuildArch:     noarch
+%endif
+Provides:      fcitx-branding = %{version}
+Conflicts:     otherproviders(fcitx-branding)
+
+%description branding-upstream
+Fcitx default skin.
+
+You can either use this package or download from kde-look.org using knewstaff in fcitx-config-kde4.
+
 %package skin-classic
 Summary:       Fcitx Classic Skin
 Group:         System/I18n/Chinese
@@ -373,6 +405,11 @@ make DESTDIR=%{buildroot} install
 
 cd ..
 
+# install openSUSE branding
+pushd %{buildroot}%{_datadir}/%{name}/skin/
+tar -xzf %{SOURCE8}
+popd
+
 # fix desktop file
 sed -i "s/x-fskin/x-fskin;/" %{buildroot}%{_datadir}/applications/fcitx-skin-installer.desktop
 
@@ -555,6 +592,8 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||
 %exclude %{_libdir}/%{name}/fcitx-pinyin.so
 %exclude %{_libdir}/%{name}/fcitx-table.so
 %exclude %{_libdir}/%{name}/fcitx-qw.so
+%exclude %{_datadir}/%{name}/skin/openSUSE-default
+%exclude %{_datadir}/%{name}/skin/default
 %exclude %{_datadir}/%{name}/skin/classic
 %exclude %{_datadir}/%{name}/skin/dark
 
@@ -668,6 +707,14 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||
 %{_mandir}/man1/mb2org.1.gz
 %{_mandir}/man1/scel2org.1.gz
 
+%files branding-openSUSE
+%defattr(-,root,root)
+%{_datadir}/%{name}/skin/openSUSE-default
+
+%files branding-upstream
+%defattr(-,root,root)
+%{_datadir}/%{name}/skin/default
+
 %files skin-classic
 %defattr(-,root,root)
 %{_datadir}/%{name}/skin/classic

openSUSE-default.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:730a6968fa9eaf88e5ec14be5f66a2d3a3c94835ac00c8bd3e49af3e2c914a1c
+size 358500