Accepting request 898042 from home:dimstar:Factory

- Move rpm macros.gimp from /etc/rpm to %{_rpmmacrodir}.

OBS-URL: https://build.opensuse.org/request/show/898042
OBS-URL: https://build.opensuse.org/package/show/graphics/gimp?expand=0&rev=54
This commit is contained in:
Marcus Meissner 2021-06-14 08:56:39 +00:00 committed by Git OBS Bridge
parent 9ae3975b8f
commit 42cfbf5ef9
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 4 17:41:02 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Move rpm macros.gimp from /etc/rpm to %{_rpmmacrodir}.
-------------------------------------------------------------------
Mon Mar 29 13:17:56 UTC 2021 - Paolo Stivanin <info@paolostivanin.com>

View File

@ -277,11 +277,11 @@ for PLUGIN in %{buildroot}%{_libdir}/gimp/2.0/plug-ins/* ; do
done
find %{buildroot} -type f -name "*.la" -delete -print
# Install the macros file:
install -d %{buildroot}%{_sysconfdir}/rpm
install -d %{buildroot}%{_rpmmacrodir}
sed -e "s/@GIMP_APIVER@/%{apiver}/;s/@GIMP_ABIVER@/%{abiver}/" \
< $RPM_SOURCE_DIR/macros.gimp > macros.gimp
install -m 644 -c macros.gimp \
%{buildroot}%{_sysconfdir}/rpm/macros.gimp
%{buildroot}%{_rpmmacrodir}/macros.gimp
%fdupes %{buildroot}%{_datadir}/gtk-doc/
%fdupes %{buildroot}%{_libdir}/gimp/2.0/python/
%fdupes %{buildroot}%{_datadir}/gimp/2.0/
@ -380,6 +380,6 @@ install -m 644 -c macros.gimp \
# Own these repositories to not depend on gtk-doc while building:
%dir %{_datadir}/gtk-doc
%{_datadir}/gtk-doc/html/
%config %{_sysconfdir}/rpm/macros.gimp
%{_rpmmacrodir}/macros.gimp
%changelog