From 42cfbf5ef9f8c53b5083845420f0de818a37081597125c0ab7c94af38281303f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 14 Jun 2021 08:56:39 +0000 Subject: [PATCH] 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 --- gimp.changes | 5 +++++ gimp.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gimp.changes b/gimp.changes index 055f995..ae3f1cb 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 4 17:41:02 UTC 2021 - Dominique Leuenberger + +- Move rpm macros.gimp from /etc/rpm to %{_rpmmacrodir}. + ------------------------------------------------------------------- Mon Mar 29 13:17:56 UTC 2021 - Paolo Stivanin diff --git a/gimp.spec b/gimp.spec index b895a23..976eedf 100644 --- a/gimp.spec +++ b/gimp.spec @@ -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