pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 242583 from home:MargueriteSu:branches:M17N

Browse Source 
update 1.5.8

OBS-URL: https://build.opensuse.org/request/show/242583
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=110
This commit is contained in:
Marguerite Su 2014-07-27 12:38:27 +00:00 committed by Git OBS Bridge
parent 93e9855e90
commit 320ac27f24
8 changed files with 270 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ibus-README.suse → README.SUSE
View File

3
ibus-1.5.7.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:94c35138340b3a449f72456c3c77cc9e4f39283ddf9cfbebdbacf6387541343f
size 2091773

3
ibus-1.5.8.tar.gz Normal file
View File

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

39
ibus-force-python3.patch Normal file
View File

@ -0,0 +1,39 @@
Index: ibus-1.5.8/configure.ac
===================================================================
--- ibus-1.5.8.orig/configure.ac
+++ ibus-1.5.8/configure.ac
@@ -379,9 +379,9 @@ AC_ARG_WITH(python,
AM_PATH_PYTHON([2.5])
AC_PATH_PROG(PYTHON2, python2)
-if test x"$PYTHON2" = x""; then
+#if test x"$PYTHON2" = x""; then
PYTHON2=$PYTHON
-fi
+#fi
PYGOBJECT_REQUIRED=3.0.0
Index: ibus-1.5.8/python-config.py
===================================================================
--- ibus-1.5.8.orig/python-config.py
+++ ibus-1.5.8/python-config.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python2.5
-
import sys
import os
import getopt
@@ -30,10 +28,10 @@ if opt == '--help':
exit_with_usage(0)
elif opt == '--prefix':
- print sysconfig.PREFIX
+ print(sysconfig.PREFIX)
elif opt == '--exec-prefix':
- print sysconfig.EXEC_PREFIX
+ print(sysconfig.EXEC_PREFIX)
elif opt in ('--includes', '--cflags'):
flags = ['-I' + sysconfig.get_python_inc(),

13
ibus-vala-0.18.patch Normal file
View File

@ -0,0 +1,13 @@
Index: ibus-1.5.8/configure.ac
===================================================================
--- ibus-1.5.8.orig/configure.ac
+++ ibus-1.5.8/configure.ac
@@ -125,7 +125,7 @@ AC_SUBST(DATE_DISPLAY)
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CC_STDC
-AM_PROG_VALAC([0.20])
+AM_PROG_VALAC([0.18])
AC_PROG_INSTALL
AC_PROG_MAKE_SET

55
ibus.changes
View File

@ -1,5 +1,44 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 26 20:24:17 Chongqing 2014 - hillwood@linuxfans.org Sat Jul 26 18:01:19 UTC 2014 - i@marguerite.su
- update version 1.5.8
* Set max-width-chars property in ibus-setup wrapped GtkLabel
* Add German (nodeadkeys) keymap in simple.xml
* Delete Korean keymap
* Let ibus-ui-gtk3 not to show zero-lenght preedit text
* Fix many memory leaks provided by Christophe Fergeau
* Add Polish (qwertz) keymap in simple.xml
* Fix escape key with Ctrl+Shift+U ISO
* Update ibuscomposetable.h for pt-br
* Set up ibus engines when users log into the session for the first time
* Do not sort ibus engines when they are saved by ibus-setup
* Update IBusKeymap jp
* Run xmodmap after run setxkbmap -l layout
* Add ibus reset-config and read-config sub-commands
* Fix ibus-setup SEGV in enginetreeview.py
* Fix deprecated warnings with python3-gobject 3.13.3
* Export the 'IBUS_SETUP_XID' environment variable for each engine setup
* Fix deprecated gtk3 GtkMisc, GtkAlignment and vala Gdk.X11Display
* Enhance UI to add engines on ibus-setup
- mask add-libgnomekbd-and-load-preload-engines.patch and
reload-preload-engines-until-users-customize-the-list.patch
* upstream may have fixed these issues as these patches are issued
on May 7th.
- use python3 to build ibus, as hillwood switched ibus-table to python3
* add ibus-force-python3.patch, because ibus will use python3 to build
ibus-setup and bindings only when PYTHON2 variable is empty. And fix
'print sysconfig.PREFIX' syntax errors in python-config.py.
- add ibus-vala-0.18.patch to fix build for openSUSE 12.3
-------------------------------------------------------------------
Sat Jul 26 17:32:07 UTC 2014 - i@marguerite.su
- clean specfile with service and spec-cleaner
* don't use vague wildcards aggresively in %%files section
- add macros.ibus to ease packaging
-------------------------------------------------------------------
Thu Jul 26 12:24:17 UTC 2014 - hillwood@linuxfans.org
- Enable wayland support - Enable wayland support
@ -80,7 +119,7 @@ Mon Jan 27 16:49:27 UTC 2014 - ftake@geeko.jp
* fix ibus-ui-gtk3 crashes if layout is en_intl (bnc#859354) * fix ibus-ui-gtk3 crashes if layout is en_intl (bnc#859354)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 25 21:50:12 Chongqing 2013 - hillwood@linuxfans.org Mon Nov 25 21:50:12 CST 2013 - hillwood@linuxfans.org
- Better way to fix cursor following problem (on_the_spot bug) - Better way to fix cursor following problem (on_the_spot bug)
under libreoffice-kde4 (bnc#851982). under libreoffice-kde4 (bnc#851982).
@ -107,7 +146,7 @@ Thu Oct 17 07:13:31 UTC 2013 - i@marguerite.su
* ibus qt tray icon is not in keeping with KDE monochrome icon look. * ibus qt tray icon is not in keeping with KDE monochrome icon look.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 14 09:22:41 Chongqing 2013 - hillwood@linuxfans.org Mon Oct 14 09:22:41 CST 2013 - hillwood@linuxfans.org
- Obsoletes libibus-1_0-0 - Obsoletes libibus-1_0-0
@ -168,7 +207,7 @@ Tue Jul 30 17:19:47 UTC 2013 - ftake@geeko.jp
* Update UI, improve performance, fix build problems * Update UI, improve performance, fix build problems
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 9 22:23:47 Chongqing 2013 - hillwood@linuxfans.org Tue Jul 9 22:23:47 CST 2013 - hillwood@linuxfans.org
- Fix cursor following problem in KDE4 for libreoffice - Fix cursor following problem in KDE4 for libreoffice
@ -247,7 +286,7 @@ Sat Feb 16 15:59:12 UTC 2013 - ftake@geeko.jp
* update ibus-fix-tray-icon-on-gnome-3.6.patch * update ibus-fix-tray-icon-on-gnome-3.6.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 9 13:13:13 Chongqing 2013 - hillwood@linuxfans.org Sat Feb 9 13:13:13 CST 2013 - hillwood@linuxfans.org
- fix bnc#802967 - fix bnc#802967
* fix ibus's tray icon can't show in gnome-shell 3.6 for openSUSE 12.3, * fix ibus's tray icon can't show in gnome-shell 3.6 for openSUSE 12.3,
@ -269,7 +308,7 @@ Wed Oct 17 04:20:14 UTC 2012 - douglarek@outlook.com
see: http://en.opensuse.org/openSUSE:Specfile_guidelines#Parallel_make see: http://en.opensuse.org/openSUSE:Specfile_guidelines#Parallel_make
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 25 20:25:17 Chongqing 2012 - hillwood@linuxfans.org Sat Aug 25 20:25:17 CST 2012 - hillwood@linuxfans.org
- update to 1.4.2 - update to 1.4.2
Some bug fixings Some bug fixings
@ -296,12 +335,12 @@ Thu May 17 05:49:31 UTC 2012 - swyear@gmail.com
- fix build error in Factory: ln should be done in buildroot - fix build error in Factory: ln should be done in buildroot
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 7 21:54:43 Chongqing 2012 - hillwood@linuxfans.org Wed Mar 7 21:54:43 CST 2012 - hillwood@linuxfans.org
- Fix FSF-address warnings in RPMLINT report - Fix FSF-address warnings in RPMLINT report
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 07 12:27:57 Chongqing 2012 - hillwood@linuxfans.org Wed Mar 07 12:27:57 CST 2012 - hillwood@linuxfans.org
- Update to 1.4.1 - Update to 1.4.1
* Many bug fixings * Many bug fixings

229
ibus.spec
View File

@ -17,42 +17,57 @@
%define with_automatic_config 1 %define with_automatic_config 1
%define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)
%define with_python3 1
%if 0%{?suse_version} >= 1310
%define with_wayland 1
%else
%define with_wayland 0
%endif
Name: ibus Name: ibus
Version: 1.5.7 Version: 1.5.8
Release: 0 Release: 0
Url: http://code.google.com/p/ibus/
Summary: Intelligent Input Bus for Linux OS Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1+ License: LGPL-2.1+
Group: System/I18n/Chinese Group: System/I18n/Chinese
Url: https://github.com/ibus/
Source: https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version}.tar.gz Source: https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version}.tar.gz
Source2: ibus-README.suse Source2: README.SUSE
Source3: xim.ibus.suse.template Source3: xim.ibus.suse.template
Source4: xim.d-ibus-121 Source4: xim.d-ibus-121
Source5: kde.tar.gz Source5: kde.tar.gz
Source6: kde-12.2.tar.gz Source6: kde-12.2.tar.gz
Source7: baselibs.conf Source7: macros.ibus
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp # PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp
Patch0: ibus-python-install-dir.patch Patch0: ibus-python-install-dir.patch
%if %{with_automatic_config} %if %{with_automatic_config}
# PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue 1641 ftake@geeko.jp # PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue 1641 ftake@geeko.jp
Patch1: add-libgnomekbd-and-load-preload-engines.patch Patch1: add-libgnomekbd-and-load-preload-engines.patch
# PATCH-FEATURE-UPSTREAM reload-preload-engines-until-users-customize-the-list.patch Issue 1641 ftake@geeko.jp # PATCH-FEATURE-UPSTREAM reload-preload-engines-until-users-customize-the-list.patch Issue 1641 ftake@geeko.jp
Patch2: reload-preload-engines-until-users-customize-the-list.patch Patch2: reload-preload-engines-until-users-customize-the-list.patch
%endif %endif
# PATCH-FIX-OPENSUSE reload-preload-engines-until-users-customize-the-list.patch ftake@geeko.jp # PATCH-FIX-OPENSUSE reload-preload-engines-until-users-customize-the-list.patch ftake@geeko.jp
Patch3: show-input-mode-icon.patch Patch3: show-input-mode-icon.patch
# PATFH-FIX-SUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwa@suse.de -- Fix lost XIM input after screenlock # PATFH-FIX-SUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwa@suse.de -- Fix lost XIM input after screenlock
Patch4: ibus-xim-fix-re-focus-after-lock.patch Patch4: ibus-xim-fix-re-focus-after-lock.patch
# PATCH-FIX-UPSTREAM marguerite@opensuse.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build # Ibus will use python3 only when variable PYTHON2 is empty.
PreReq: /usr/bin/touch # Thus ibus-setup and bindings are still bytecompiled with python2.
Provides: locale(ja;ko;zh) # Then python3 support is useless, so we force python3 when python3
# is enabled, and fix syntax errors in python-config.py
Patch5: ibus-force-python3.patch
# PATCH-FIX-UPSTREAM marguerite@opensuse.org
# lower vala version
Patch6: ibus-vala-0.18.patch
BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel >= 0.83.0 BuildRequires: dbus-1-python-devel >= 0.83.0
%if %{with_automatic_config} %if %{with_automatic_config}
BuildRequires: dbus-1-x11 BuildRequires: dbus-1-x11
BuildRequires: libgnomekbd-devel
%endif %endif
BuildRequires: dconf-devel >= 0.7.5 BuildRequires: dconf-devel >= 0.7.5
BuildRequires: fdupes BuildRequires: fdupes
@ -64,35 +79,48 @@ BuildRequires: gtk-doc >= 1.9
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: intltool BuildRequires: intltool
BuildRequires: iso-codes-devel BuildRequires: iso-codes-devel
%if %{with_automatic_config}
BuildRequires: libgnomekbd-devel
%endif
BuildRequires: libnotify-devel >= 0.7 BuildRequires: libnotify-devel >= 0.7
BuildRequires: libtool BuildRequires: libtool
# directory ownership { # directory ownership {
BuildRequires: oxygen-icon-theme BuildRequires: oxygen-icon-theme
BuildRequires: oxygen-icon-theme-scalable BuildRequires: oxygen-icon-theme-scalable
BuildRequires: x11-tools
# } # }
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: python >= 2.5 %if %{with_python3}
BuildRequires: python-gobject2-devel BuildRequires: python3
BuildRequires: python3-gobject2-devel
Requires: python3-gobject2
%else
BuildRequires: python
BuildRequires: python-gobject-devel
Requires: python-gobject
%endif
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: pkgconfig(vapigen) >= 0.20 BuildRequires: pkgconfig(vapigen)
%if %{with_wayland}
BuildRequires: pkgconfig(wayland-client) >= 1.2.0 BuildRequires: pkgconfig(wayland-client) >= 1.2.0
%endif
BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbcommon)
Requires: dbus-1-python Requires: dbus-1-python
Requires: dconf Requires: dconf
Requires: iso-codes Requires: iso-codes
Requires: libibus-1_0-5 = %{version} Requires: libibus-1_0-5 = %{version}
Requires: python-gobject %if %{with_python3}
Obsoletes: ibus-gnome-shell # ibus-setup will require typelib(Gdk) typelib(GdkX11), typelib(Gtk)
Obsoletes: libibus-1_0-0 # which are provided by two packages in openSUSE, so we limit their
# versions to 3.0 only.
Requires: typelib-1_0-Gtk-3_0
%endif
Recommends: %{name}-lang Recommends: %{name}-lang
#Fix cursor following problem in KDE4 for libreoffice. #Fix cursor following problem in KDE4 for libreoffice.
Supplements: packageand(libreoffice:libreoffice-gnome) Supplements: packageand(libreoffice:libreoffice-gnome)
%define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0) Provides: locale(ja;ko;zh)
Obsoletes: ibus-gnome-shell
Obsoletes: libibus-1_0-0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
@ -117,38 +145,51 @@ This package contains the introspection bindings for the IBus library.
Summary: IBus im module for gtk2 Summary: IBus im module for gtk2
Group: System/I18n/Chinese Group: System/I18n/Chinese
Requires: %{name} = %{version} Requires: %{name} = %{version}
%gtk2_immodule_requires
Supplements: packageand(ibus:gtk2) Supplements: packageand(ibus:gtk2)
%{gtk2_immodule_requires}
%description gtk %description gtk
This package contains ibus im module for gtk2 This package contains ibus im module for gtk2
%package gtk3 %package gtk3
Summary: IBus im module for gtk3 Summary: IBus im module for gtk3
Group: System/I18n/Chinese Group: System/I18n/Chinese
Requires: %{name} = %{version}
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
%gtk3_immodule_requires Requires: %{name} = %{version}
Supplements: packageand(ibus:gtk3) Supplements: packageand(ibus:gtk3)
%{gtk3_immodule_requires}
%description gtk3 %description gtk3
This package contains ibus im module for gtk3 This package contains ibus im module for gtk3
%if %{with_python3}
%package -n python3-ibus
Summary: Python3 module for ibus
Group: System/I18n/Chinese
Requires: %{name} = %{version}
Requires: python3
%description -n python3-ibus
This package contains python3 module for ibus
%else
%package -n python-ibus %package -n python-ibus
Summary: Python module for ibus Summary: Python module for ibus
Group: System/I18n/Chinese Group: System/I18n/Chinese
Requires: %{name} = %{version} Requires: %{name} = %{version}
%py_requires
%description -n python-ibus %description -n python-ibus
This package contains python module for ibus This package contains python module for ibus
%endif
%package branding-openSUSE-KDE %package branding-openSUSE-KDE
Summary: openSUSE branding for KDE Summary: openSUSE branding for KDE
Group: System/GUI/KDE Group: System/GUI/KDE
Requires: ibus = %{version} Requires: ibus = %{version}
Supplements: packageand(ibus:kdelibs4)
Supplements: packageand(ibus:branding-openSUSE-KDE) Supplements: packageand(ibus:branding-openSUSE-KDE)
Supplements: packageand(ibus:kdelibs4)
Provides: ibus-branding = %{version} Provides: ibus-branding = %{version}
Conflicts: otherproviders(ibus-branding) Conflicts: otherproviders(ibus-branding)
%if 0%{?suse_version} >= 1140 %if 0%{?suse_version} >= 1140
@ -173,20 +214,23 @@ The ibus-devel package contains the header files and developer
docs for ibus. docs for ibus.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860) # hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if %suse_version < 1310 %if 0%{?suse_version} < 1310
%patch6 -p1
sed -i \ sed -i \
-e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \ -e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \
-e's@\(gtk-query-immodules-2.0\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \ -e's@\(gtk-query-immodules-2.0\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \
$RPM_SOURCE_DIR/baselibs.conf %{SOURCE99}
%endif %endif
%if %{with_automatic_config} %if %{with_automatic_config}
%patch1 -p1 #%patch1 -p1
%patch2 -p1 #%patch2 -p1
rm -f bindings/vala/ibus-1.0.vapi rm -f bindings/vala/ibus-1.0.vapi
rm -f data/dconf/00-upstream-settings rm -f data/dconf/00-upstream-settings
%endif %endif
@ -194,40 +238,53 @@ rm -f data/dconf/00-upstream-settings
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%if %{with_python3}
%patch5 -p1
%endif
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
%build %build
autoreconf -fi autoreconf -fi
intltoolize -f intltoolize -f
%configure --disable-static \ %configure --disable-static \
--enable-gtk3 \ --enable-gtk3 \
--enable-vala \ --enable-vala \
%if %{with_python3}
--with-python=python3 \
%endif
--enable-python-library \ --enable-python-library \
--enable-introspection \ --enable-introspection \
--disable-gconf \ --disable-gconf \
--enable-dconf \ --enable-dconf \
--enable-gtk-doc \ --enable-gtk-doc \
%if %{with_wayland}
--enable-wayland \ --enable-wayland \
%endif
%if %{with_automatic_config} %if %{with_automatic_config}
--enable-libgnomekbd \ --enable-libgnomekbd \
%endif %endif
--enable-surrounding-text \ --enable-surrounding-text \
--libexecdir=%{_prefix}/%{_lib}/ibus --libexecdir=%{_libdir}/ibus
%if %{with_automatic_config} %if %{with_automatic_config}
make -C ui/gtk3 maintainer-clean-generic make -C ui/gtk3 maintainer-clean-generic %{?_smp_mflags}
%endif %endif
make %{?jobs:-j %jobs} make %{?_smp_mflags}
%install %install
%makeinstall make DESTDIR=%{buildroot} install %{?_smp_mflags}
# autostart
mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/
install -m 644 $RPM_SOURCE_DIR/xim.d-ibus-121 $RPM_BUILD_ROOT/etc/X11/xim.d/ibus
sed -i 1i"SYS_LIB=%{_lib}" $RPM_BUILD_ROOT/etc/X11/xim.d/ibus # autostart
mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xim.d/ibus
sed -i 1i"SYS_LIB=%{_lib}" %{buildroot}%{_sysconfdir}/X11/xim.d/ibus
PRIORITY=40 PRIORITY=40
pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ pushd %{buildroot}%{_sysconfdir}/X11/xim.d/
for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \ for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \
pa ru sk vi zh_TW zh_CN zh_HK zh_SG \ pa ru sk vi zh_TW zh_CN zh_HK zh_SG \
de fr it es nl cs pl da nn nb fi en sv de fr it es nl cs pl da nn nb fi en sv
@ -240,15 +297,14 @@ pushd $RPM_BUILD_ROOT/etc/X11/xim.d/
popd popd
# remove static libs # remove static libs
rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.*a find %{buildroot}/%{_libdir} -name "*.la" -type f -delete -print
rm -f $RPM_BUILD_ROOT/%{_libdir}/libibus-*.*a
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p %{buildroot}%{_datadir}/pixmaps
ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \ ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \
$RPM_BUILD_ROOT%{_datadir}/pixmaps/ibus-keyboard.png %{buildroot}%{_datadir}/pixmaps/ibus-keyboard.png
# touch for %%ghost # touch for %%ghost
touch $RPM_BUILD_ROOT/%{_sysconfdir}/dconf/db/ibus touch %{buildroot}/%{_sysconfdir}/dconf/db/ibus
# fix kde monochrome icons # fix kde monochrome icons
%if 0%{?suse_version} >= 1230 %if 0%{?suse_version} >= 1230
@ -267,100 +323,111 @@ mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/
cp -r ibus-keyboard.svgz %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/ cp -r ibus-keyboard.svgz %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/
popd popd
%suse_update_desktop_file %name-setup System Utility settings # install macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm
install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/rpm
%fdupes %buildroot/%_prefix %suse_update_desktop_file %{name}-setup System Utility settings
%fdupes -s $RPM_BUILD_ROOT
%fdupes %{buildroot}
%find_lang ibus10 %{?no_lang_C} %find_lang ibus10 %{?no_lang_C}
%post %post
%glib2_gsettings_schema_post %{glib2_gsettings_schema_post}
%posttrans %posttrans
dconf update dconf update
%postun %postun
%glib2_gsettings_schema_postun %{glib2_gsettings_schema_postun}
dconf update dconf update
%post gtk %post gtk
%gtk2_immodule_post %{gtk2_immodule_post}
%postun gtk %postun gtk
%gtk2_immodule_postun %{gtk2_immodule_postun}
%post -n libibus-1_0-5 -p /sbin/ldconfig %post -n libibus-1_0-5 -p /sbin/ldconfig
%postun -n libibus-1_0-5 -p /sbin/ldconfig %postun -n libibus-1_0-5 -p /sbin/ldconfig
%post gtk3 %post gtk3
%gtk3_immodule_post %{gtk3_immodule_post}
%postun gtk3 %postun gtk3
%gtk3_immodule_postun %{gtk3_immodule_postun}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root)
%doc AUTHORS COPYING README %doc AUTHORS COPYING README README.SUSE xim.ibus.suse.template
%doc $RPM_SOURCE_DIR/xim.ibus.suse.template %config %{_sysconfdir}/rpm/macros.ibus
%doc $RPM_SOURCE_DIR/ibus-README.suse %config %{_sysconfdir}/X11/xim.d/*
%dir /etc/X11/xim.d
%config /etc/X11/xim.d/*
%dir %{_datadir}/ibus/
%{_bindir}/ibus %{_bindir}/ibus
%{_bindir}/ibus-daemon %{_bindir}/ibus-daemon
%{_bindir}/ibus-setup %{_bindir}/ibus-setup
%{_datadir}/ibus/* %{_datadir}/ibus/
%{_datadir}/applications/* %{_datadir}/applications/ibus-setup.desktop
%dir %{_datadir}/GConf
%dir %{_datadir}/GConf/gsettings
%{_datadir}/GConf/gsettings/ibus.convert %{_datadir}/GConf/gsettings/ibus.convert
%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml %{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/ibus*.*
%{_datadir}/pixmaps/* %{_datadir}/pixmaps/ibus-keyboard.png
%{_prefix}/%{_lib}/ibus %{_libdir}/ibus
%{_datadir}/bash-completion %{_datadir}/bash-completion/completions/ibus.bash
%dir %config %{_sysconfdir}/dconf/db/ibus.d %dir %config %{_sysconfdir}/dconf/db/ibus.d
# These files are not config files. Users must not modify them. # These files are not config files. Users must not modify them.
%ghost %{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings %ghost %{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
%ghost %{_sysconfdir}/dconf/db/ibus %ghost %{_sysconfdir}/dconf/db/ibus
%ghost %{_sysconfdir}/dconf/profile/ibus %ghost %{_sysconfdir}/dconf/profile/ibus
%{_mandir}/man1/ibus* %{_mandir}/man1/ibus.1.gz
%{_mandir}/man1/ibus-daemon.1.gz
%{_mandir}/man1/ibus-setup.1.gz
%files lang -f ibus10.lang %files lang -f ibus10.lang
%defattr(-,root,root)
%files -n libibus-1_0-5 %files -n libibus-1_0-5
%defattr(-,root,root,-) %defattr(-,root,root)
%{_libdir}/lib*.so.* %{_libdir}/libibus-1.0.so.*
%files -n typelib-1_0-IBus-1_0 %files -n typelib-1_0-IBus-1_0
%defattr(-,root,root,-) %defattr(-,root,root)
%{_libdir}/girepository-1.0/IBus-1.0.typelib %{_libdir}/girepository-1.0/IBus-1.0.typelib
%files gtk %files gtk
%defattr(-,root,root,-) %defattr(-,root,root)
%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
%files gtk3 %files gtk3
%defattr(-,root,root,-) %defattr(-,root,root)
%{_libdir}/gtk-3.0/3.0.0/immodules/* %{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so
%if %{with_python3}
%files -n python3-ibus
%defattr(-,root,root)
%{python3_sitearch}/ibus
%else
%files -n python-ibus %files -n python-ibus
%defattr(-,root,root,-) %defattr(-,root,root)
%{python_sitearch}/ibus %{python_sitearch}/ibus
%endif
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root)
%{_libdir}/lib*.so %{_libdir}/libibus-1.0.so
%{_includedir}/* %{_includedir}/ibus-1.0
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/ibus
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/ibus-1.0.pc
%{_datadir}/gir-1.0/IBus-1.0.gir %{_datadir}/gir-1.0/IBus-1.0.gir
%{_datadir}/vala/vapi/* %{_datadir}/vala/vapi/ibus-1.0.deps
%{_datadir}/vala/vapi/ibus-1.0.vapi
%files branding-openSUSE-KDE %files branding-openSUSE-KDE
%defattr(-,root,root,-) %defattr(-,root,root)
%dir %{_datadir}/icons/oxygen/24x24 %dir %{_datadir}/icons/oxygen/24x24
%dir %{_datadir}/icons/oxygen/24x24/apps %dir %{_datadir}/icons/oxygen/24x24/apps
%{_datadir}/icons/oxygen/*/apps/ibus-keyboard.* %{_datadir}/icons/oxygen/*/apps/ibus-keyboard.*

19
macros.ibus Normal file
View File

@ -0,0 +1,19 @@
# RPM macros for ibus
%_ibus_includedir %{_includedir}/ibus-1.0
%_ibus_libdir %{_libdir}/ibus
%_ibus_libexecdir %{_ibus_libdir}
%_ibus_datadir %{_datadir}/ibus
%_ibus_componentdir %{_ibus_datadir}/component
%_ibus_enginedir %{_ibus_datadir}/engine
%_ibus_keymapdir %{_ibus_datadir}/keymaps
%_ibus_setupdir %{_ibus_datadir}/setup
%_ibus_autostartdir %{_sysconfdir}/X11/xim.d
%_ibus_tabledir %{_datadir}/ibus-table/tables
%_ibus_icondir %{_datadir}/ibus-table/icons
%ibus_requires \
Requires: ibus
%ibus_table_requires \
Requires: ibus-table