mirror of
https://abf.rosa.ru/djam/ibus.git
synced 2025-02-23 09:42:54 +00:00
Updated to 1.5.22
This commit is contained in:
VictorR2007
parent
fd6d6f2984
commit
ba8373ae26
2 changed files with 43 additions and 52 deletions
|
|
@ -1,9 +1,11 @@
|
|||
diff -urN ibus-1.5.7/setup/ibus-setup.desktop.in ibus-1.5.7-patched/setup/ibus-setup.desktop.in
|
||||
--- ibus-1.5.7/setup/ibus-setup.desktop.in 2014-04-30 17:09:48.000000000 +1100
|
||||
+++ ibus-1.5.7-patched/setup/ibus-setup.desktop.in 2014-09-01 18:49:10.927514148 +1100
|
||||
@@ -6,4 +6,5 @@
|
||||
diff -urN ibus-1.5.22/setup/ibus-setup.desktop ibus-1.5.22-pathed/setup/ibus-setup.desktop
|
||||
--- ibus-1.5.22/setup/ibus-setup.desktop 2020-02-21 15:46:17.000000000 +0300
|
||||
+++ ibus-1.5.22-pathed/setup/ibus-setup.desktop 2020-10-13 11:57:57.296342851 +0300
|
||||
@@ -6,6 +6,7 @@
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
+NoDisplay=true
|
||||
Categories=Settings;
|
||||
# GNOME uses its own "input source" settings instead
|
||||
NotShowIn=GNOME;Unity;
|
||||
|
|
|
|||
85
ibus.spec
85
ibus.spec
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
Summary: A next generation input framework
|
||||
Name: ibus
|
||||
Version: 1.5.8
|
||||
Release: 7
|
||||
Version: 1.5.22
|
||||
Release: 1
|
||||
License: GPLv2+
|
||||
Group: System/Internationalization
|
||||
Url: http://code.google.com/p/ibus/
|
||||
|
|
@ -15,10 +15,8 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
|
|||
Source1: ibus.macros
|
||||
Patch0: ibus-1.5.7-desktop.patch
|
||||
BuildRequires: dconf
|
||||
BuildRequires: GConf2
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: intltool
|
||||
BuildRequires: kde4-macros
|
||||
BuildRequires: vala
|
||||
BuildRequires: vala-devel
|
||||
BuildRequires: vala-tools
|
||||
|
|
@ -27,47 +25,48 @@ BuildRequires: pkgconfig(dbus-1)
|
|||
BuildRequires: pkgconfig(dbus-glib-1)
|
||||
BuildRequires: pkgconfig(dbus-python)
|
||||
BuildRequires: pkgconfig(dconf)
|
||||
BuildRequires: pkgconfig(gconf-2.0)
|
||||
BuildRequires: pkgconfig(gdk-2.0)
|
||||
BuildRequires: pkgconfig(gdk-3.0)
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.32.0
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
|
||||
BuildRequires: pkgconfig(gobject-2.0) >= 2.32.0
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(gthread-2.0) >= 2.32.0
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(iso-codes)
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
BuildRequires: pkgconfig(pygobject-2.0)
|
||||
BuildRequires: pkgconfig(pygobject-3.0) >= 3.0.0
|
||||
BuildRequires: pkgconfig(python)
|
||||
BuildRequires: pkgconfig(vapigen)
|
||||
BuildRequires: pkgconfig(python3)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: python-gi
|
||||
|
||||
BuildRequires: pkgconfig(Qt5Concurrent)
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt5Gui)
|
||||
BuildRequires: wayland-devel
|
||||
BuildRequires: cldr-emoji-annotation
|
||||
BuildRequires: unicode-emoji
|
||||
BuildRequires: unicode-ucd
|
||||
Requires: iso-codes
|
||||
Requires: librsvg
|
||||
Requires: python-gobject >= 2.15
|
||||
Requires: python-dbus >= 0.83.0
|
||||
Requires: pygtk2.0
|
||||
Requires: python-notify
|
||||
Requires: pyxdg
|
||||
Recommends: %{name}-gtk = %{EVRD}
|
||||
Requires: %{name}-ui
|
||||
Requires: python3-gobject
|
||||
Requires: python3-dbus
|
||||
Requires: python3-notify
|
||||
Requires: python3-pyxdg
|
||||
Suggests: %{name}-gtk = %{EVRD}
|
||||
|
||||
%description
|
||||
IBus is a next generation input framework.
|
||||
|
||||
%files -f %{name}10.lang
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README
|
||||
%{_sysconfdir}/gconf/schemas/ibus.schemas
|
||||
%doc AUTHORS ChangeLog NEWS README
|
||||
%{_sysconfdir}/dconf/profile/ibus
|
||||
%{_sysconfdir}/dconf/db/ibus.d
|
||||
%{_bindir}/*
|
||||
%{_libexecdir}/ibus-dconf
|
||||
%{_libexecdir}/ibus-gconf
|
||||
%{_libexecdir}/ibus-extension-gtk3
|
||||
%{_libexecdir}/ibus-x11
|
||||
%{_libexecdir}/ibus-ui-emojier
|
||||
%{_libexecdir}/ibus-wayland
|
||||
%{_libexecdir}/ibus-portal
|
||||
# %{_libexecdir}/ibus-ui-gtk*
|
||||
%{_libexecdir}/ibus-engine-simple
|
||||
%exclude %{_datadir}/ibus/component/gtkpanel.xml
|
||||
|
|
@ -75,15 +74,14 @@ IBus is a next generation input framework.
|
|||
%{_datadir}/bash-completion/completions/ibus.bash
|
||||
%{_datadir}/GConf/gsettings/ibus.convert
|
||||
%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
|
||||
%{_datadir}/dbus-1/services/org.freedesktop.IBus.service
|
||||
%{_datadir}/dbus-1/services/org.freedesktop.portal.IBus.service
|
||||
%{_datadir}/ibus/*
|
||||
%{_datadir}/gettext/its/*
|
||||
%{_iconsdir}/*/*/*/*
|
||||
%{_mandir}/man1/ibus-daemon.1.*
|
||||
%{_mandir}/man1/ibus-setup.1.*
|
||||
%{_mandir}/man1/ibus.1.*
|
||||
%{py_puresitedir}/*
|
||||
%ifarch x86_64
|
||||
%{py_platsitedir}/*
|
||||
%endif
|
||||
%{_mandir}/man1/*
|
||||
%{_mandir}/man5/*
|
||||
%{_mandir}/man7/*
|
||||
|
||||
%preun
|
||||
%preun_uninstall_gconf_schemas ibus
|
||||
|
|
@ -137,7 +135,7 @@ IBus development package: development libraries, header files, and the like.
|
|||
%{_datadir}/gir-1.0/*.gir
|
||||
%{_datadir}/vala/vapi/*.vapi
|
||||
%{_datadir}/vala/vapi/ibus-1.0.deps
|
||||
%{_rpmmacrodir}/*%{name}*
|
||||
%{_sysconfdir}/rpm/macros.d/%{name}.macros
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -176,7 +174,7 @@ Summary: GTK+ 3.0 UI for IBus
|
|||
Group: System/Internationalization
|
||||
Provides: ibus-ui
|
||||
Requires: %{name} = %{version}
|
||||
Recommends: %{name}-gtk3 = %{version}
|
||||
Suggests: %{name}-gtk3 = %{version}
|
||||
Conflicts: ibus < 1.4.99.20121006-2
|
||||
|
||||
%description ui-gtk3
|
||||
|
|
@ -190,18 +188,19 @@ GTK+ 3.0 UI for IBus.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%apply_patches
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--enable-vala=yes \
|
||||
--enable-gtk3 \
|
||||
--enable-gtk2 \
|
||||
--enable-dconf \
|
||||
--enable-gconf \
|
||||
--disable-gconf \
|
||||
--with-python=python3 \
|
||||
--enable-python-library \
|
||||
--enable-dbus-python-check \
|
||||
--enable-surrounding-text \
|
||||
--disable-python2 \
|
||||
--disable-dbus-python-check \
|
||||
--enable-wayland
|
||||
|
||||
%make
|
||||
|
||||
|
|
@ -209,21 +208,11 @@ GTK+ 3.0 UI for IBus.
|
|||
%makeinstall_std
|
||||
|
||||
# install rpm macro
|
||||
%install_macro %{name} %{SOURCE1}
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm/macros.d/
|
||||
install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.d/%{name}.macros
|
||||
|
||||
rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/ibus.desktop
|
||||
|
||||
# install ui automatic selector wrapper
|
||||
mv %{buildroot}%{_bindir}/%{name}-daemon %{buildroot}%{_bindir}/%{name}-daemon-real
|
||||
cat >%{buildroot}%{_bindir}/%{name}-daemon <<EOF
|
||||
#!/bin/bash
|
||||
if [ "\$DESKTOP" = "KDE" -a -x %{_kde_libdir}/kde4/libexec/kimpanel-ibus-panel ]
|
||||
then
|
||||
exec %{_bindir}/ibus-daemon-real --panel=%{_kde_libdir}/kde4/libexec/kimpanel-ibus-panel "\$@".
|
||||
else
|
||||
exec %{_bindir}/ibus-daemon-real "\$@"
|
||||
fi
|
||||
EOF
|
||||
chmod 0755 %{buildroot}%{_bindir}/%{name}-daemon
|
||||
|
||||
|
||||
%find_lang %{name}10
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue