rpms/ibus
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update ibus.spec to delete GConf dependencies

Browse Source
This commit is contained in:
Takao Fujiwara 2019-02-22 19:17:45 +09:00
parent 44d6cef411
commit ba99db5fb5
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ibus.spec
View File

@ -35,7 +35,7 @@
Name: ibus Name: ibus
Version: 1.5.19 Version: 1.5.19
Release: 16%{?dist} Release: 17%{?dist}
Summary: Intelligent Input Bus for Linux OS Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/ibus/%name/wiki URL: https://github.com/ibus/%name/wiki
@ -62,14 +62,16 @@ BuildRequires: dconf-devel
BuildRequires: dbus-x11 BuildRequires: dbus-x11
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-gobject BuildRequires: python3-gobject
%if %with_python2
# https://bugzilla.gnome.org/show_bug.cgi?id=759334 # https://bugzilla.gnome.org/show_bug.cgi?id=759334
# Need python2 for gsettings-schema-convert # Need python2 for gsettings-schema-convert
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: vala
# for AM_GCONF_SOURCE_2 in configure.ac # for AM_GCONF_SOURCE_2 in configure.ac
BuildRequires: GConf2-devel BuildRequires: GConf2-devel
BuildRequires: git
BuildRequires: intltool BuildRequires: intltool
%endif
BuildRequires: git
BuildRequires: vala
BuildRequires: iso-codes-devel BuildRequires: iso-codes-devel
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
BuildRequires: libwayland-client-devel BuildRequires: libwayland-client-devel
@ -292,7 +294,11 @@ done
install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf} install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
# install .desktop files # install .desktop files
%if %with_python2
echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desktop echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desktop
%else
echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/org.freedesktop.IBus.Setup.desktop
%endif
#echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%%{_sysconfdir}/xdg/autostart/ibus.desktop #echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%%{_sysconfdir}/xdg/autostart/ibus.desktop
desktop-file-install --delete-original \ desktop-file-install --delete-original \
@ -388,7 +394,11 @@ dconf update || :
# gtk-update-icon-cache is executed in the main package only one time. # gtk-update-icon-cache is executed in the main package only one time.
%files setup %files setup
%{_bindir}/ibus-setup %{_bindir}/ibus-setup
%if %with_python2
%{_datadir}/applications/ibus-setup.desktop %{_datadir}/applications/ibus-setup.desktop
%else
%{_datadir}/applications/org.freedesktop.IBus.Setup.desktop
%endif
%{_datadir}/ibus/setup %{_datadir}/ibus/setup
%{_datadir}/man/man1/ibus-setup.1.gz %{_datadir}/man/man1/ibus-setup.1.gz
@ -424,6 +434,10 @@ dconf update || :
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Fri Feb 22 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.19-17
- Delete dconf dependencies and gettext migration for gschema.xml file
- Delete Super-space notification in initial login in non-GNOME desktops
* Tue Feb 05 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.19-16 * Tue Feb 05 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.19-16
- Resolves: #1671286 wrong mutex - Resolves: #1671286 wrong mutex