From d546e2cc27345091da08bc097aa2b292dc7fd95c02f5931e07a939dc1a4f2ead Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 30 Aug 2017 12:25:02 +0000 Subject: [PATCH] Accepting request 519537 from home:alarrosa:branches:M17N - Don't build the branding-openSUSE-KDE package on SLE OBS-URL: https://build.opensuse.org/request/show/519537 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=169 --- ibus.changes | 5 +++++ ibus.spec | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/ibus.changes b/ibus.changes index 1d9afed..8653106 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 29 12:38:07 UTC 2017 - alarrosa@suse.com + +- Don't build the branding-openSUSE-KDE package on SLE + ------------------------------------------------------------------- Sun Jul 23 15:14:29 UTC 2017 - ftake@geeko.jp diff --git a/ibus.spec b/ibus.spec index 809b3ec..761f495 100644 --- a/ibus.spec +++ b/ibus.spec @@ -21,8 +21,10 @@ %define with_python3 0 %if 0%{?is_opensuse} %define with_wayland 1 +%define with_kde 1 %else %define with_wayland 0 +%define with_kde 0 %endif Name: ibus @@ -37,8 +39,10 @@ Source: %{name}-%{version}.tar.gz Source2: README.SUSE Source3: xim.ibus.suse.template Source4: xim.d-ibus-121 +%if %{with_kde} Source5: kde.tar.gz Source6: kde-12.2.tar.gz +%endif Source7: macros.ibus Source10: ibus-autostart Source11: ibus-autostart.desktop @@ -87,8 +91,10 @@ BuildRequires: python-devel BuildRequires: python3-devel BuildRequires: pkgconfig(json-glib-1.0) # directory ownership { +%if %{with_kde} BuildRequires: oxygen-icon-theme BuildRequires: oxygen-icon-theme-scalable +%endif BuildRequires: x11-tools # } BuildRequires: pkg-config @@ -204,6 +210,7 @@ This package contains python module for ibus %endif +%if %{with_kde} %package branding-openSUSE-KDE Summary: openSUSE branding for KDE Group: System/GUI/KDE @@ -218,6 +225,7 @@ BuildArch: noarch %description branding-openSUSE-KDE openSUSE branding for KDE monochrome icons in systray. +%endif %package devel Summary: Development tools for ibus @@ -333,6 +341,7 @@ ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \ # touch for %%ghost touch %{buildroot}/%{_sysconfdir}/dconf/db/ibus +%if %{with_kde} # fix kde monochrome icons %if 0%{?suse_version} >= 1230 cp -r %{SOURCE5} ./ @@ -349,6 +358,7 @@ done mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/ cp -r ibus-keyboard.svgz %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/ popd +%endif # install macros mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -458,10 +468,12 @@ dconf update %{_datadir}/vala/vapi/ibus-1.0.deps %{_datadir}/vala/vapi/ibus-1.0.vapi +%if %{with_kde} %files branding-openSUSE-KDE %defattr(-,root,root) %dir %{_datadir}/icons/oxygen/* %dir %{_datadir}/icons/oxygen/*/apps %{_datadir}/icons/oxygen/*/apps/ibus-keyboard.* +%endif %changelog