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

Accepting request 161650 from home:jengelh:branches:M17N

Browse Source 
- Put gnome-shell integration files into separate package because
  these (since openSUSE 12.3) pull in a lot of new unwanted packages
  on a GNOME-less system compared to 12.2. (bnc#812298)
- Set versions on BuildRequires according to configure.ac
- Use more robust make install call
- Remove redundant %clean section

OBS-URL: https://build.opensuse.org/request/show/161650
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=60
This commit is contained in:
Marguerite Su 2013-03-28 18:17:11 +00:00 committed by Git OBS Bridge
parent 4934327121
commit 294035c6c6
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ibus.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Mar 28 15:32:19 UTC 2013 - jengelh@inai.de
- Put gnome-shell integration files into separate package because
these (since openSUSE 12.3) pull in a lot of new unwanted packages
on a GNOME-less system compared to 12.2. (bnc#812298)
- Set versions on BuildRequires according to configure.ac
- Use more robust make install call
- Remove redundant %clean section
-------------------------------------------------------------------
Sat Feb 16 15:59:12 UTC 2013 - ftake@geeko.jp

39
ibus.spec
View File

@ -24,7 +24,11 @@ Name: ibus
Version: 1.4.2
Release: 0
Url: http://code.google.com/p/ibus/
Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1+
Group: System/I18n
Source: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
Source1: xim.d-ibus
Source2: ibus-README.suse
Source3: xim.ibus.suse.template
@ -37,25 +41,23 @@ Patch2: ibus-fix-docs-build-error.patch
Patch3: ibus-fix-tray-icon-on-gnome-3.6.patch
# PATCH-FIX-OPENSUSE ibus_indicator-14.patch
Patch4: ibus_indicator-14.patch
Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1+
Group: System/I18n/Chinese
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /usr/bin/touch
Provides: locale(ja;ko;zh)
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel
BuildRequires: dbus-1-python-devel >= 0.83.0
BuildRequires: fdupes
BuildRequires: gconf2-devel
BuildRequires: gconf2-devel >= 2.12
BuildRequires: gettext-devel
BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
BuildRequires: glib2-devel >= 2.26.0
BuildRequires: gobject-introspection-devel >= 0.9.6
BuildRequires: gtk-doc >= 1.9
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: iso-codes-devel
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: python
BuildRequires: python >= 2.5
BuildRequires: python-gobject2-devel
BuildRequires: update-desktop-files
Requires: dbus-1-python
@ -116,6 +118,16 @@ Supplements: packageand(ibus:gtk3)
This package contains ibus im module for gtk3
%endif
%package gnome-shell
# This implicitly draws in the GNOME Shell itself and thus is separate
Summary: GNOME Shell integration for IBus
Group: System/GUI/GNOME
BuildArch: noarch
%description gnome-shell
The package contains the files for integrating IBus into the GNOME
Shell.
%package devel
Summary: Development tools for ibus
Group: Development/Libraries/Other
@ -154,7 +166,7 @@ intltoolize -f
make %{?_smp_mflags}
%install
%makeinstall
make install DESTDIR="%buildroot"
mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/
%if %{build_without_dbus_autolaunch}
install -m 644 $RPM_SOURCE_DIR/xim.d-ibus-121 $RPM_BUILD_ROOT/etc/X11/xim.d/ibus
@ -190,6 +202,7 @@ ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \
%find_lang %{domain_name}
%find_gconf_schemas
cat %{name}.schemas_list %{domain_name}.lang > %{name}.lst
%fdupes %buildroot/%_prefix
%fdupes -s $RPM_BUILD_ROOT
%if 0%{suse_version} >= 1230
@ -197,9 +210,6 @@ install -m755 -d %{buildroot}%{_datadir}/gnome-shell/extensions/ibus_indicator-1
install -m644 ibus_indicator-14@ftake.github.com/* %{buildroot}%{_datadir}/gnome-shell/extensions/ibus_indicator-14@ftake.github.com
%endif
%clean
rm -rf %buildroot
%pre -f %{name}.schemas_pre
%post gtk
@ -241,7 +251,10 @@ rm -rf %buildroot
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/pixmaps/*
%{_prefix}/%{_lib}/ibus
%if 0%{suse_version} >= 1230
%files gnome-shell
%defattr(-,root,root)
%dir %{_datadir}/gnome-shell/
%dir %{_datadir}/gnome-shell/extensions/
%dir %{_datadir}/gnome-shell/extensions/ibus_indicator-14@ftake.github.com/