From ac87de61c8748b11edd1e4f1b4a681e465fc5ded0fd10efe116069d500eb005a Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 3 Jul 2021 08:00:55 +0000 Subject: [PATCH] Accepting request 903229 from home:dimstar:Factory - Move fcitx.macros from /etc/rpm to %_rpmmacrodir (boo#1185657). OBS-URL: https://build.opensuse.org/request/show/903229 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=161 --- fcitx.changes | 5 +++++ fcitx.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fcitx.changes b/fcitx.changes index 385992a..dd0f8ee 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 30 12:25:43 UTC 2021 - Dominique Leuenberger + +- Move fcitx.macros from /etc/rpm to %_rpmmacrodir (boo#1185657). + ------------------------------------------------------------------- Tue Dec 1 05:40:13 UTC 2020 - Marguerite Su diff --git a/fcitx.spec b/fcitx.spec index 88f9509..3f21030 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -391,7 +391,7 @@ pushd %{buildroot}%{_distconfdir}/X11/xim.d/ popd # install rpm macros -install -D -m644 %{SOURCE9} %{buildroot}%{_sysconfdir}/rpm/macros.%{name} +install -D -m644 %{SOURCE9} %{buildroot}%{_rpmmacrodir}/macros.%{name} # remove *.la rm -rf %{buildroot}%{_libdir}/lib%{name}-config.la @@ -569,7 +569,7 @@ exit 0 %{_datadir}/%{name}/skin/dark %files devel -%config %{_sysconfdir}/rpm/macros.%{name} +%{_rpmmacrodir}/macros.%{name} %{_includedir}/* %{_bindir}/%{name}4-config %{_libdir}/%{name}/libexec/comp-spell-dict