diff --git a/ibus.changes b/ibus.changes
index 89f21e9..d3b111f 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -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>
 
diff --git a/ibus.spec b/ibus.spec
index 9229f8d..dc606d7 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # 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
 License:        LGPL-2.1-or-later
 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
 Source2:        README.SUSE
 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
 
 # install macros
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/rpm
+mkdir -p %{buildroot}%{_rpmmacrodir}
+install -m 644 %{SOURCE7} %{buildroot}%{_rpmmacrodir}
 
 %suse_update_desktop_file -r org.freedesktop.IBus.Setup Settings DesktopSettings X-SuSE-Core-System
 
@@ -295,7 +295,7 @@ dconf update
 %files
 %doc AUTHORS README README.SUSE xim.ibus.suse.template
 %license COPYING
-%config %{_sysconfdir}/rpm/macros.ibus
+%{_rpmmacrodir}/macros.ibus
 %config %{_sysconfdir}/X11/xim.d/*
 %{_bindir}/ibus
 %{_bindir}/ibus-autostart
diff --git a/python-ibus.spec b/python-ibus.spec
index f6f3894..98bb525 100644
--- a/python-ibus.spec
+++ b/python-ibus.spec
@@ -12,19 +12,18 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # 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
-
 Name:           python-ibus
 Version:        1.5.20
 Release:        0
 Summary:        Python2 module for ibus
 License:        LGPL-2.1-or-later
 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:         %{_name}-%{version}.tar.gz
 # PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp
@@ -42,22 +41,21 @@ BuildRequires:  intltool
 BuildRequires:  iso-codes-devel
 BuildRequires:  libnotify-devel >= 0.7
 BuildRequires:  libtool
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  python
 BuildRequires:  python-devel
 BuildRequires:  python-gobject-devel
 BuildRequires:  unicode-ucd
 BuildRequires:  update-desktop-files
+# copy_deep method is supported since 0.31.1
+BuildRequires:  vala >= 0.31.1
 BuildRequires:  x11-tools
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(vapigen)
 BuildRequires:  pkgconfig(xkbcommon)
-# copy_deep method is supported since 0.31.1
-BuildRequires:  vala >= 0.31.1
 Requires:       %{_name} = %{version}
 Requires:       python-gobject
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 IBus, short for Intelligent Input Bus, is an input framework. IBus