diff --git a/ibus.spec b/ibus.spec index 47bf127..43f91cb 100644 --- a/ibus.spec +++ b/ibus.spec @@ -9,12 +9,6 @@ %global with_kde5 0 %endif -%if (0%{?fedora} > 27 || 0%{?rhel} > 7) -%global with_gtk_script 0 -%else -%global with_gtk_script 1 -%endif - %global with_emoji_harfbuzz 1 %global ibus_api_version 1.0 @@ -320,28 +314,14 @@ desktop-file-install --delete-original \ %find_lang %{name}10 %post -%if %with_gtk_script -# recreate icon cache -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%endif - %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || : %postun if [ "$1" -eq 0 ]; then -%if %with_gtk_script - # recreate icon cache - touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%endif - %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || : # 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_gtk_script - glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : -%endif # 'dconf update' sometimes does not update the db... dconf update || : [ -f %{_sysconfdir}/dconf/db/ibus ] && \ @@ -352,10 +332,6 @@ if [ "$1" -eq 0 ]; then fi %posttrans -%if %with_gtk_script -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : -%endif dconf update || : [ -x %{_bindir}/ibus ] && \ %{_bindir}/ibus write-cache --system &>/dev/null || : @@ -364,37 +340,6 @@ dconf update || : %postun libs -p /sbin/ldconfig -%if %with_gtk_script -%post gtk2 -if [ $1 -eq 1 ] ; then - # For upgrades, the cache will be regenerated by the new package's %%postun - gtk-query-immodules-2.0-%{__isa_bits} --update-cache &> /dev/null || : -fi - -%endif - -%if %with_gtk_script -%postun gtk2 -gtk-query-immodules-2.0-%{__isa_bits} --update-cache &> /dev/null || : - -%endif - -%if %with_gtk_script -%post gtk3 -if [ $1 -eq 1 ] ; then - # For upgrades, the cache will be regenerated by the new package's %%postun - gtk-query-immodules-3.0-%{__isa_bits} --update-cache &> /dev/null || : -fi - -%endif - -%if %with_gtk_script -%postun gtk3 -gtk-query-immodules-3.0-%{__isa_bits} --update-cache &> /dev/null || : - -%endif - - # FIXME: no version number %files -f %{name}10.lang %doc AUTHORS COPYING README