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

Accepting request 701577 from M17N

Browse Source 
Move RPM macros to %_rpmmacrodir. (forwarded request 701537 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/701577
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=92
This commit is contained in:
Dominique Leuenberger 2019-05-10 07:10:28 +00:00 committed by Git OBS Bridge
commit b099217cf5
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ibus.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 8 09:40:05 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Move RPM macros to %_rpmmacrodir.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 4 15:48:52 UTC 2019 - Fuminobu Takeyama <ftake@geeko.jp> Mon Mar 4 15:48:52 UTC 2019 - Fuminobu Takeyama <ftake@geeko.jp>

10
ibus.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -35,7 +35,7 @@ Release: 0
Summary: The "Intelligent Input Bus" input method Summary: The "Intelligent Input Bus" input method
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/I18n/Chinese Group: System/I18n/Chinese
Url: https://github.com/ibus/ URL: https://github.com/ibus/
Source: https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version}.tar.gz Source: https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version}.tar.gz
Source2: README.SUSE Source2: README.SUSE
Source3: xim.ibus.suse.template Source3: xim.ibus.suse.template
@ -259,8 +259,8 @@ ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \
touch %{buildroot}/%{_sysconfdir}/dconf/db/ibus touch %{buildroot}/%{_sysconfdir}/dconf/db/ibus
# install macros # install macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_rpmmacrodir}
install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/rpm install -m 644 %{SOURCE7} %{buildroot}%{_rpmmacrodir}
%suse_update_desktop_file -r org.freedesktop.IBus.Setup Settings DesktopSettings X-SuSE-Core-System %suse_update_desktop_file -r org.freedesktop.IBus.Setup Settings DesktopSettings X-SuSE-Core-System
@ -295,7 +295,7 @@ dconf update
%files %files
%doc AUTHORS README README.SUSE xim.ibus.suse.template %doc AUTHORS README README.SUSE xim.ibus.suse.template
%license COPYING %license COPYING
%config %{_sysconfdir}/rpm/macros.ibus %{_rpmmacrodir}/macros.ibus
%config %{_sysconfdir}/X11/xim.d/* %config %{_sysconfdir}/X11/xim.d/*
%{_bindir}/ibus %{_bindir}/ibus
%{_bindir}/ibus-autostart %{_bindir}/ibus-autostart

12
python-ibus.spec
View File

@ -12,19 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%define _name ibus %define _name ibus
Name: python-ibus Name: python-ibus
Version: 1.5.20 Version: 1.5.20
Release: 0 Release: 0
Summary: Python2 module for ibus Summary: Python2 module for ibus
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/I18n/Chinese Group: System/I18n/Chinese
Url: https://github.com/ibus/ URL: https://github.com/ibus/
Source: https://github.com/ibus/ibus/releases/download/%{version}/%{_name}-%{version}.tar.gz Source: https://github.com/ibus/ibus/releases/download/%{version}/%{_name}-%{version}.tar.gz
# Source: %{_name}-%{version}.tar.gz # Source: %{_name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp # PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp
@ -42,22 +41,21 @@ BuildRequires: intltool
BuildRequires: iso-codes-devel BuildRequires: iso-codes-devel
BuildRequires: libnotify-devel >= 0.7 BuildRequires: libnotify-devel >= 0.7
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkg-config BuildRequires: pkgconfig
BuildRequires: python BuildRequires: python
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-gobject-devel BuildRequires: python-gobject-devel
BuildRequires: unicode-ucd BuildRequires: unicode-ucd
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
# copy_deep method is supported since 0.31.1
BuildRequires: vala >= 0.31.1
BuildRequires: x11-tools BuildRequires: x11-tools
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(vapigen)
BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbcommon)
# copy_deep method is supported since 0.31.1
BuildRequires: vala >= 0.31.1
Requires: %{_name} = %{version} Requires: %{_name} = %{version}
Requires: python-gobject Requires: python-gobject
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
IBus, short for Intelligent Input Bus, is an input framework. IBus IBus, short for Intelligent Input Bus, is an input framework. IBus