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
This commit is contained in:
Marguerite Su 2021-07-03 08:00:55 +00:00 committed by Git OBS Bridge
parent 536aa5e865
commit ac87de61c8
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 30 12:25:43 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Move fcitx.macros from /etc/rpm to %_rpmmacrodir (boo#1185657).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 1 05:40:13 UTC 2020 - Marguerite Su <i@marguerite.su> Tue Dec 1 05:40:13 UTC 2020 - Marguerite Su <i@marguerite.su>

View File

@ -391,7 +391,7 @@ pushd %{buildroot}%{_distconfdir}/X11/xim.d/
popd popd
# install rpm macros # install rpm macros
install -D -m644 %{SOURCE9} %{buildroot}%{_sysconfdir}/rpm/macros.%{name} install -D -m644 %{SOURCE9} %{buildroot}%{_rpmmacrodir}/macros.%{name}
# remove *.la # remove *.la
rm -rf %{buildroot}%{_libdir}/lib%{name}-config.la rm -rf %{buildroot}%{_libdir}/lib%{name}-config.la
@ -569,7 +569,7 @@ exit 0
%{_datadir}/%{name}/skin/dark %{_datadir}/%{name}/skin/dark
%files devel %files devel
%config %{_sysconfdir}/rpm/macros.%{name} %{_rpmmacrodir}/macros.%{name}
%{_includedir}/* %{_includedir}/*
%{_bindir}/%{name}4-config %{_bindir}/%{name}4-config
%{_libdir}/%{name}/libexec/comp-spell-dict %{_libdir}/%{name}/libexec/comp-spell-dict