public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ibus] autotool: Fixed misc issues.
@ 2026-05-31 2:05 Takao Fujiwara
0 siblings, 0 replies; 3+ messages in thread
From: Takao Fujiwara @ 2026-05-31 2:05 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/ibus
Branch : autotool
Commit : 49a7b5cb8361ba804ba1ef868a18bcee29367c1e
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date : 2012-11-22T18:17:14+09:00
Stats : +1/-72 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ibus/c/49a7b5cb8361ba804ba1ef868a18bcee29367c1e?branch=autotool
Log:
Fixed misc issues.
---
diff --git a/ibus.spec b/ibus.spec
index ae867c5..cf13211 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -3,7 +3,6 @@
%{!?gtk3_binary_version: %define gtk3_binary_version %(pkg-config --variable=gtk_binary_version gtk+-3.0)}
%define with_xkbfile 1
-%define with_dconf 1
%define with_pygobject2 1
%define with_pygobject3 1
@@ -62,12 +61,10 @@ BuildRequires: dbus-glib-devel
BuildRequires: dbus-python-devel >= %{dbus_python_version}
BuildRequires: desktop-file-utils
BuildRequires: gtk-doc
-%if %with_dconf
BuildRequires: dconf-devel
BuildRequires: dbus-x11
BuildRequires: vala
BuildRequires: vala-tools
-%endif
# for AM_GCONF_SOURCE_2 in configure.ac
BuildRequires: GConf2-devel
%if %with_pygobject3
@@ -104,11 +101,7 @@ Requires: dbus-x11
%if (0%{?fedora} <= 17 && 0%{?rhel} < 7)
Requires: im-chooser
%endif
-%if %with_dconf
Requires: dconf
-%else
-Requires: GConf2
-%endif
Requires: notify-python
Requires: libgnomekbd
Requires: librsvg2
@@ -122,14 +115,8 @@ Obsoletes: ibus-gnome3 < %{version}-%{release}
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
-%if %with_dconf
Requires(postun): dconf
Requires(posttrans): dconf
-%endif
-
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
@@ -235,17 +222,6 @@ rm -f data/dconf/00-upstream-settings
%build
%if %with_xkbfile
-XKB_PRELOAD_LAYOUTS=\
-"us,us(chr),us(dvorak),ad,al,am,ara,az,ba,bd,be,bg,br,bt,by,"\
-"de,dk,ca,ch,cn(tib),cz,ee,epo,es,et,fi,fo,fr,"\
-"gb,ge,ge(dsb),ge(ru),ge(os),gh,gh(akan),gh(ewe),gh(fula),gh(ga),gh(hausa),"\
-"gn,gr,hu,hr,ie,ie(CloGaelach),il,"\
-"in,"\
-"in(tel),in(bolnagri),iq,iq(ku),ir,ir(ku),is,it,jp,"\
-"kg,kh,kz,la,latam,lk,lk(tam_unicode),lt,lv,ma,ma(tifinagh),mal,mao,"\
-"me,mk,mm,mt,mv,ng,ng(hausa),ng,ng(igbo),ng(yoruba),nl,no,no(smi),np,"\
-"pk,pl,pl(csb),pt,ro,rs,ru,ru(cv),ru(kom),ru(sah),ru(tt),ru(xal),"\
-"se,si,sk,sy,sy(ku),th,tj,tr,ua,uz,vn"
autoreconf -f -i
%endif
%configure \
@@ -260,14 +236,11 @@ autoreconf -f -i
--with-panel-icon-keyboard=legacy \
%endif
%if %with_xkbfile
- --with-xkb-preload-layouts=$XKB_PRELOAD_LAYOUTS \
--with-xkb-command=ibus-xkb \
--enable-libgnomekbd \
%endif
-%if %with_dconf
--enable-dconf \
--disable-gconf \
-%endif
%if %with_pygobject2
--enable-python-library \
%endif
@@ -291,8 +264,7 @@ cd ..
%endif
%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-%{ibus_api_version}.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus.la
@@ -331,36 +303,12 @@ cd ..
# FIXME: no version number
%find_lang %{name}10
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
# recreate icon cache
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || :
-%if !%with_dconf
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ibus.schemas > /dev/null 2>&1 || :
-%endif
-
-%pre
-%if !%with_dconf
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas > /dev/null 2>&1 || :
-fi
-%endif
-
-%preun
-%if !%with_dconf
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas > /dev/null 2>&1 || :
-fi
-%endif
-
%postun
if [ "$1" -eq 0 ]; then
# recreate icon cache
@@ -371,22 +319,18 @@ if [ "$1" -eq 0 ]; then
# if alternative was set to manual, reset to auto
[ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
-%if %with_dconf
glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
# 'dconf update' sometimes does not update the db...
dconf update
if [ -f %{_sysconfdir}/dconf/db/ibus ] ; then
rm -f %{_sysconfdir}/dconf/db/ibus
fi
-%endif
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%if %with_dconf
glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
dconf update
-%endif
%post libs -p /sbin/ldconfig
@@ -406,7 +350,6 @@ dconf update
# FIXME: no version number
%files -f %{name}10.lang
-%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%if %with_pygobject2
%dir %{python_sitelib}/ibus
@@ -421,53 +364,40 @@ dconf update
%endif
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/apps/*
-%if %with_dconf
%{_datadir}/GConf/gsettings/*
%{_datadir}/glib-2.0/schemas/*.xml
%{_libexecdir}/ibus-engine-simple
%{_libexecdir}/ibus-dconf
-%else
-%{_libexecdir}/ibus-gconf
-%endif
%{_libexecdir}/ibus-ui-gtk3
%{_libexecdir}/ibus-x11
# {_sysconfdir}/xdg/autostart/ibus.desktop
%{_sysconfdir}/bash_completion.d/ibus.bash
-%if %with_dconf
%{_sysconfdir}/dconf/db/ibus.d
%{_sysconfdir}/dconf/profile/ibus
-%else
-%{_sysconfdir}/gconf/schemas/ibus.schemas
-%endif
%config %{_xinputconf}
%if %with_xkbfile
%{_libexecdir}/ibus-xkb
%endif
%files libs
-%defattr(-,root,root,-)
%{_libdir}/libibus-%{ibus_api_version}.so.*
%if %with_pygobject3
%{_libdir}/girepository-1.0/IBus-1.0.typelib
%endif
%files gtk2
-%defattr(-,root,root,-)
%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.so
%files gtk3
-%defattr(-,root,root,-)
%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus.so
%if %with_gjs
%files gnome3
-%defattr(-,root,root,-)
%{_datadir}/gnome-shell/js/ui/status/ibus
%{_datadir}/gnome-shell/extensions/ibus-indicator@example.com
%endif
%files devel
-%defattr(-,root,root,-)
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%{_includedir}/*
@@ -476,7 +406,6 @@ dconf update
%{_datadir}/vala/vapi/ibus-1.0.deps
%files devel-docs
-%defattr(-,root,root,-)
%{_datadir}/gtk-doc/html/*
%changelog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [rpms/ibus] autotool: Fixed misc issues.
@ 2026-05-31 2:06 Takao Fujiwara
0 siblings, 0 replies; 3+ messages in thread
From: Takao Fujiwara @ 2026-05-31 2:06 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/ibus
Branch : autotool
Commit : 28399e7f1a14fef34f96cee6f906a5f3826cb729
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date : 2013-07-30T16:16:34+09:00
Stats : +52/-52 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ibus/c/28399e7f1a14fef34f96cee6f906a5f3826cb729?branch=autotool
Log:
Fixed misc issues.
---
diff --git a/ibus.spec b/ibus.spec
index be2039c..fffad9e 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -24,29 +24,29 @@
%global dbus_python_version 0.83.0
-Name: ibus
-Version: 1.5.3
-Release: 1%{?dist}
-Summary: Intelligent Input Bus for Linux OS
-License: LGPLv2+
-Group: System Environment/Libraries
-URL: http://code.google.com/p/ibus/
-Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1: %{name}-xinput
+Name: ibus
+Version: 1.5.3
+Release: 1%{?dist}
+Summary: Intelligent Input Bus for Linux OS
+License: LGPLv2+
+Group: System Environment/Libraries
+URL: http://code.google.com/p/ibus/
+Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Source1: %{name}-xinput
# Upstreamed patches.
# Patch0: %{name}-HEAD.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=810211
-Patch1: %{name}-810211-no-switch-by-no-trigger.patch
+Patch1: %{name}-810211-no-switch-by-no-trigger.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=541492
-Patch2: %{name}-541492-xkb.patch
+Patch2: %{name}-541492-xkb.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=530711
-Patch3: %{name}-530711-preload-sys.patch
+Patch3: %{name}-530711-preload-sys.patch
# Hide minor input method engines on ibus-setup by locale
-Patch4: %{name}-xx-setup-frequent-lang.patch
+Patch4: %{name}-xx-setup-frequent-lang.patch
%if (0%{?fedora} < 19 && 0%{?rhel} < 7)
# Keep the default triggers for the back compatiblity.
-Patch95: %{name}-xx-ctrl-space.patch
+Patch95: %{name}-xx-ctrl-space.patch
%endif
@@ -70,23 +70,23 @@ BuildRequires: intltool
BuildRequires: iso-codes-devel
BuildRequires: libnotify-devel
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-gtk2 = %{version}-%{release}
-Requires: %{name}-gtk3 = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-gtk2%{?_isa} = %{version}-%{release}
+Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
%if %with_python_pkg
-Requires: %{name}-setup = %{version}-%{release}
+Requires: %{name}-setup = %{version}-%{release}
%endif
-Requires: iso-codes
-Requires: dbus-python >= %{dbus_python_version}
-Requires: dbus-x11
-Requires: dconf
-Requires: notify-python
-Requires: librsvg2
+Requires: iso-codes
+Requires: dbus-python >= %{dbus_python_version}
+Requires: dbus-x11
+Requires: dconf
+Requires: notify-python
+Requires: librsvg2
# for setxkbmap
-Requires: xorg-x11-xkb-utils
+Requires: xorg-x11-xkb-utils
# The feature in ibus-gnome3 is provided by gnome-shell.
-Obsoletes: ibus-gnome3 < %{version}-%{release}
+Obsoletes: ibus-gnome3 < %{version}-%{release}
%if ! %with_python_pkg
%if %with_pygobject3
Requires: pygobject3
@@ -112,33 +112,33 @@ Requires(postun): %{_sbindir}/alternatives
IBus means Intelligent Input Bus. It is an input framework for Linux OS.
%package libs
-Summary: IBus libraries
-Group: System Environment/Libraries
+Summary: IBus libraries
+Group: System Environment/Libraries
-Requires: glib2 >= %{glib_ver}
-Requires: dbus >= 1.2.4
+Requires: glib2 >= %{glib_ver}
+Requires: dbus >= 1.2.4
%description libs
This package contains the libraries for IBus
%package gtk2
-Summary: IBus im module for gtk2
-Group: System Environment/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Summary: IBus im module for gtk2
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires(post): glib2 >= %{glib_ver}
# Added for upgrade el6 to el7
-Provides: ibus-gtk = %{version}-%{release}
-Obsoletes: ibus-gtk < %{version}-%{release}
+Provides: ibus-gtk = %{version}-%{release}
+Obsoletes: ibus-gtk < %{version}-%{release}
%description gtk2
This package contains ibus im module for gtk2
%package gtk3
-Summary: IBus im module for gtk3
-Group: System Environment/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Summary: IBus im module for gtk3
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires(post): glib2 >= %{glib_ver}
%description gtk3
@@ -174,25 +174,25 @@ and this package will be deprecated.
%endif
%package devel
-Summary: Development tools for ibus
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Requires: glib2-devel
-Requires: dbus-devel
+Summary: Development tools for ibus
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: glib2-devel
+Requires: dbus-devel
%description devel
The ibus-devel package contains the header files and developer
docs for ibus.
%package devel-docs
-Summary: Developer documents for ibus
-Group: Development/Libraries
+Summary: Developer documents for ibus
+Group: Development/Libraries
%if (0%{?fedora} >= 19 || 0%{?rhel} >= 7)
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
%else
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%endif
%description devel-docs
@@ -392,7 +392,7 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
-* Thu Jul 11 2013 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.3-1
+* Fri Jul 26 2013 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.3-1
- Bumped to 1.5.3
- Deleted ibus-xx-g-s-disable-preedit.patch as EOL.
- Deleted ibus-gjs as EOL.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [rpms/ibus] autotool: Fixed misc issues.
@ 2026-05-31 2:05 Takao Fujiwara
0 siblings, 0 replies; 3+ messages in thread
From: Takao Fujiwara @ 2026-05-31 2:05 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/ibus
Branch : autotool
Commit : 6bf9178ae94240a674520e711254b292286a3ae6
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date : 2012-11-27T16:08:35+09:00
Stats : +47/-41 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/ibus/c/6bf9178ae94240a674520e711254b292286a3ae6?branch=autotool
Log:
Fixed misc issues.
---
diff --git a/ibus-530711-preload-sys.patch b/ibus-530711-preload-sys.patch
index 5b7aace..f4b8fff 100644
--- a/ibus-530711-preload-sys.patch
+++ b/ibus-530711-preload-sys.patch
@@ -1,6 +1,6 @@
-From a2558c5d403bc150fae7fb1e07f0b541a7f90e8a Mon Sep 17 00:00:00 2001
+From 456ea33621814aa08ca62e31f7cb1e770ebb3670 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 14 Nov 2012 07:07:08 +0900
+Date: Tue, 27 Nov 2012 15:53:27 +0900
Subject: [PATCH] Reload preload engines until users customize the list.
The idea is, if users don't customize the preload_engines with ibus-setup,
diff --git a/ibus-541492-xkb.patch b/ibus-541492-xkb.patch
index 653130d..3e26c70 100644
--- a/ibus-541492-xkb.patch
+++ b/ibus-541492-xkb.patch
@@ -1,6 +1,6 @@
-From c53acc91c40753ec845a4a73035769d4e205be7c Mon Sep 17 00:00:00 2001
+From 8ca5d79b3f919621df691f8acbec58b206b15aa2 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 14 Nov 2012 07:06:58 +0900
+Date: Tue, 27 Nov 2012 15:53:14 +0900
Subject: [PATCH] Add ibus-xkb and libgnomekbd.
---
@@ -23,14 +23,14 @@ Subject: [PATCH] Add ibus-xkb and libgnomekbd.
src/ibus.h | 1 +
src/ibusxkbxml.c | 466 +++++++++++++++++++++++++++++++
src/ibusxkbxml.h | 187 +++++++++++++
- ui/gtk3/Makefile.am | 39 +++
+ ui/gtk3/Makefile.am | 37 +++
ui/gtk3/gkbdlayout.vala.false | 63 +++++
ui/gtk3/gkbdlayout.vala.true | 108 +++++++
ui/gtk3/keybindingmanager.vala | 14 +-
ui/gtk3/panel.vala | 353 ++++++++++++++++++++---
ui/gtk3/switcher.vala | 49 ++--
ui/gtk3/xkblayout.vala | 464 ++++++++++++++++++++++++++++++
- 26 files changed, 2628 insertions(+), 667 deletions(-)
+ 26 files changed, 2626 insertions(+), 667 deletions(-)
create mode 100644 bindings/vala/Gkbd-3.0.metadata
create mode 100644 bindings/vala/Xkl-1.0.metadata
create mode 100644 engine/ibus-xkb/Makefile.am
@@ -2512,31 +2512,29 @@ index 0000000..6f5b7bd
+G_END_DECLS
+#endif
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
-index 5473027..cbd746c 100644
+index 5473027..6cb02a1 100644
--- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am
-@@ -47,6 +47,9 @@ USE_SYMBOL_ICON = FALSE
+@@ -47,6 +47,8 @@ USE_SYMBOL_ICON = FALSE
# force include config.h before gi18n.h.
AM_CPPFLAGS = -include $(CONFIG_HEADER)
-+HAVE_IBUS_XKB_C = $(strip $(subst false, FALSE, $(subst true, TRUE, $(HAVE_IBUS_XKB))))
+HAVE_IBUS_GKBD_C = $(strip $(subst false, FALSE, $(subst true, TRUE, $(HAVE_IBUS_GKBD))))
+
AM_CFLAGS = \
@GLIB2_CFLAGS@ \
@GIO2_CFLAGS@ \
-@@ -58,6 +61,10 @@ AM_CFLAGS = \
+@@ -58,6 +60,9 @@ AM_CFLAGS = \
-DBINDIR=\"$(bindir)\" \
-DIBUS_DISABLE_DEPRECATED \
-DSWITCHER_USE_SYMBOL_ICON=$(USE_SYMBOL_ICON) \
-+ -DHAVE_IBUS_XKB=$(HAVE_IBUS_XKB_C) \
+ -DHAVE_IBUS_GKBD=$(HAVE_IBUS_GKBD_C) \
+ -DIBUS_XKB_COMMAND=\"$(libexecdir)/ibus-xkb\" \
+ -DXKB_LAYOUTS_MAX_LENGTH=4 \
-Wno-unused-variable \
-Wno-unused-but-set-variable \
-Wno-unused-function \
-@@ -91,6 +98,7 @@ ibus_ui_gtk3_SOURCES = \
+@@ -91,6 +96,7 @@ ibus_ui_gtk3_SOURCES = \
application.vala \
candidatearea.vala \
candidatepanel.vala \
@@ -2544,7 +2542,7 @@ index 5473027..cbd746c 100644
handle.vala \
iconwidget.vala \
keybindingmanager.vala \
-@@ -99,17 +107,48 @@ ibus_ui_gtk3_SOURCES = \
+@@ -99,17 +105,48 @@ ibus_ui_gtk3_SOURCES = \
property.vala \
separator.vala \
switcher.vala \
diff --git a/ibus-xx-setup-frequent-lang.patch b/ibus-xx-setup-frequent-lang.patch
index 5129239..ca70048 100644
--- a/ibus-xx-setup-frequent-lang.patch
+++ b/ibus-xx-setup-frequent-lang.patch
@@ -1,6 +1,6 @@
-From cdfad7a4f7026c6db0e570b4d9b2c14d1c7ca2b2 Mon Sep 17 00:00:00 2001
+From d3ce0467bb7825cc97da9646254bc09f58119fda Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 14 Nov 2012 07:07:17 +0900
+Date: Tue, 27 Nov 2012 15:53:34 +0900
Subject: [PATCH] Enable ibus-setup to show the frequently used languages
only in IME list.
diff --git a/ibus.spec b/ibus.spec
index cf13211..a2b1874 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -1,31 +1,30 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?gtk2_binary_version: %define gtk2_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)}
-%{!?gtk3_binary_version: %define gtk3_binary_version %(pkg-config --variable=gtk_binary_version gtk+-3.0)}
+%{!?gtk2_binary_version: %global gtk2_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)}
+%{!?gtk3_binary_version: %global gtk3_binary_version %(pkg-config --variable=gtk_binary_version gtk+-3.0)}
-%define with_xkbfile 1
-%define with_pygobject2 1
-%define with_pygobject3 1
+%global with_xkbfile 1
+%global with_pygobject2 1
+%global with_pygobject3 1
%if (0%{?fedora} > 17 || 0%{?rhel} > 6)
#ifarch ppc ppc64 s390 s390x
-%define with_gjs 0
+%global with_gjs 0
%else
-%define with_gjs 1
+%global with_gjs 1
%endif
-%define ibus_gjs_version 3.4.1.20120815
-%define ibus_gjs_build_failure 1
+%global ibus_gjs_version 3.4.1.20120815
+%global ibus_gjs_build_failure 1
-%define ibus_api_version 1.0
+%global ibus_api_version 1.0
-%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
-%define dbus_python_version 0.83.0
+%global glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
+%global dbus_python_version 0.83.0
# FIXME: It's better to use the new icon names
-%define gnome_icon_theme_legacy_version 2.91.6
+%global gnome_icon_theme_legacy_version 2.91.6
Name: ibus
Version: 1.4.99.20121109
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -54,7 +53,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext-devel
BuildRequires: libtool
-BuildRequires: python
+BuildRequires: python2-devel
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: dbus-glib-devel
@@ -110,6 +109,7 @@ Requires: gnome-icon-theme-legacy >= %{gnome_icon_theme_legacy_version}
Requires: gnome-icon-theme-symbolic
%endif
%if (0%{?fedora} > 17 || 0%{?rhel} > 6)
+# The feature in ibus-gnome3 is provided by gnome-shell.
Obsoletes: ibus-gnome3 < %{version}-%{release}
%endif
@@ -121,7 +121,7 @@ Requires(posttrans): dconf
Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
-%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
+%global _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
%description
IBus means Intelligent Input Bus. It is an input framework for Linux OS.
@@ -142,9 +142,6 @@ Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires(post): glib2 >= %{glib_ver}
-# Added for F14: need to keep bumping for backports
-Obsoletes: ibus-gtk < %{version}-%{release}
-Provides: ibus-gtk = %{version}-%{release}
%description gtk2
This package contains ibus im module for gtk2
@@ -284,6 +281,7 @@ echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desk
echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ibus.desktop
+
# workaround for desktop-file-install
sed -i -e 's|Comment\[ja\]=IBus |& |' \
$RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desktop
@@ -295,7 +293,7 @@ desktop-file-install --delete-original \
# https://bugzilla.redhat.com/show_bug.cgi?id=657165
d=`basename %SOURCE2 .tar.gz`
cd $d
-make DESTDIR=$RPM_BUILD_ROOT install
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/ibus-gjs.mo
cd ..
%endif
@@ -337,23 +335,30 @@ dconf update
%postun libs -p /sbin/ldconfig
%post gtk2
-%{_bindir}/update-gtk-immodules %{_host} || :
+if [ $1 -eq 1 ] ; then
+ # For upgrades, the cache will be regenerated by the new package's %%postun
+ %{_bindir}/update-gtk-immodules %{_host} || :
+fi
%postun gtk2
%{_bindir}/update-gtk-immodules %{_host} || :
%post gtk3
-%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || :
+if [ $1 -eq 1 ] ; then
+ # For upgrades, the cache will be regenerated by the new package's %%postun
+ /usr/bin/gtk-query-immodules-3.0-%{__isa_bits} --update-cache &> /dev/null || :
+fi
%postun gtk3
-%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || :
+/usr/bin/gtk-query-immodules-3.0-%{__isa_bits} --update-cache &> /dev/null || :
+
# FIXME: no version number
%files -f %{name}10.lang
%doc AUTHORS COPYING README
%if %with_pygobject2
-%dir %{python_sitelib}/ibus
-%{python_sitelib}/ibus/*
+%dir %{python2_sitelib}/ibus
+%{python2_sitelib}/ibus/*
%endif
%dir %{_datadir}/ibus/
%{_bindir}/ibus
@@ -409,6 +414,9 @@ dconf update
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Nov 27 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20121109-3
+- Fixed misc issues.
+
* Thu Oct 11 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20121109-2
- Obsoleted ibus-gnome3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-05-31 2:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-31 2:05 [rpms/ibus] autotool: Fixed misc issues Takao Fujiwara
2026-05-31 2:05 Takao Fujiwara
2026-05-31 2:06 Takao Fujiwara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox