Hello community,
here is the log from the commit of package ibus for openSUSE:Factory checked in
at 2013-10-17 14:16:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibus (Old)
and /work/SRC/openSUSE:Factory/.ibus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibus/ibus.changes 2013-10-11
16:25:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ibus.new/ibus.changes 2013-10-17
17:38:49.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Oct 17 07:13:31 UTC 2013 - i...@marguerite.su
+
+- add a branding-openSUSE-KDE subpackage.
+ * provides kde monochrome icons for 13.1 default KDE theme.
+- port fix for bnc#820218 here
+ * ibus qt tray icon is not in keeping with KDE monochrome icon look.
+
+-------------------------------------------------------------------
+Mon Oct 14 09:22:41 CST 2013 - hillw...@linuxfans.org
+
+- Obsoletes libibus-1_0-0
+
+-------------------------------------------------------------------
New:
----
kde-12.2.tar.gz
kde.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus.spec ++++++
--- /var/tmp/diff_new_pack.xS72P2/_old 2013-10-17 17:38:50.000000000 +0200
+++ /var/tmp/diff_new_pack.xS72P2/_new 2013-10-17 17:38:50.000000000 +0200
@@ -30,6 +30,8 @@
Source2: ibus-README.suse
Source3: xim.ibus.suse.template
Source4: xim.d-ibus-121
+Source5: kde.tar.gz
+Source6: kde-12.2.tar.gz
%if %{with_automatic_config}
Patch0: ibus-python-install-dir.patch
# PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue
1641 ft...@geeko.jp
@@ -62,6 +64,10 @@
%endif
BuildRequires: libnotify-devel >= 0.7
BuildRequires: libtool
+# directory ownership {
+BuildRequires: oxygen-icon-theme
+BuildRequires: oxygen-icon-theme-scalable
+# }
BuildRequires: pkg-config
BuildRequires: python >= 2.5
BuildRequires: python-gobject2-devel
@@ -80,6 +86,7 @@
Requires: typelib-1_0-Gtk-3_0
%endif
Obsoletes: ibus-gnome-shell
+Obsoletes: libibus-1_0-0
Recommends: %{name}-lang
#Fix cursor following problem in KDE4 for libreoffice, libreoffice-kde and
libreoffice-kde4 can destroy cursor following, please don't install them with
ibus.
@@ -139,7 +146,20 @@
%description -n python-ibus
This package contains python module for ibus
+%package branding-openSUSE-KDE
+Summary: openSUSE branding for KDE
+Group: System/GUI/KDE
+Requires: ibus = %{version}
+Supplements: packageand(ibus:kdelibs4)
+Supplements: packageand(ibus:branding-openSUSE-KDE)
+Provides: ibus-branding = %{version}
+Conflicts: otherproviders(ibus-branding)
+%if 0%{?suse_version} >= 1140
+BuildArch: noarch
+%endif
+%description branding-openSUSE-KDE
+openSUSE branding for KDE monochrome icons in systray.
%package devel
Summary: Development tools for ibus
@@ -224,6 +244,23 @@
# touch for %%ghost
touch $RPM_BUILD_ROOT/%{_sysconfdir}/dconf/db/ibus
+# fix kde monochrome icons
+%if 0%{?suse_version} >= 1230
+cp -r %{SOURCE5} ./
+%else
+cp -r %{SOURCE6} ./
+mv kde-12.2.tar.gz kde.tar.gz
+%endif
+tar -xzf kde.tar.gz
+pushd kde
+for i in 16 22 24 32 48 ; do
+ mkdir -p %{buildroot}%{_datadir}/icons/oxygen/${i}x${i}/apps/
+ cp -r ibus-keyboard.${i}x${i}.png
%{buildroot}%{_datadir}/icons/oxygen/${i}x${i}/apps/ibus-keyboard.png
+done
+mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/
+cp -r ibus-keyboard.svgz %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/
+popd
+
%suse_update_desktop_file %name-setup System Utility settings
%fdupes %buildroot/%_prefix
@@ -316,4 +353,10 @@
%{_datadir}/gir-1.0/IBus-1.0.gir
%{_datadir}/vala/vapi/*
+%files branding-openSUSE-KDE
+%defattr(-,root,root,-)
+%dir %{_datadir}/icons/oxygen/24x24
+%dir %{_datadir}/icons/oxygen/24x24/apps
+%{_datadir}/icons/oxygen/*/apps/ibus-keyboard.*
+
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
