From c50dfae3400d107ca7517bd53fcf8d6c3c13702762b32b7721824fc99348e0cb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 12 Jun 2021 15:43:06 +0000 Subject: [PATCH] Accepting request 898513 from GNOME:Next Scripted push from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/898513 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=69 --- gtk4.changes | 5 +++++ gtk4.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gtk4.changes b/gtk4.changes index 8f746bd..23f692e 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 4 17:33:54 UTC 2021 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + ------------------------------------------------------------------- Fri May 14 13:23:27 UTC 2021 - Ferdinand Thiessen diff --git a/gtk4.spec b/gtk4.spec index 6fda875..d802a85 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -247,8 +247,8 @@ else echo 'Remove this no-longer-needed themingdir hack.' fi # Install rpm macros -mkdir -p %{buildroot}%{_sysconfdir}/rpm -cp %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm +mkdir -p %{buildroot}%{_rpmmacrodir} +cp %{SOURCE3} %{buildroot}%{_rpmmacrodir} %fdupes %{buildroot}%{_datadir} %fdupes %{buildroot}%{_libdir} @@ -348,7 +348,7 @@ cp %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm %{_libdir}/pkgconfig/gtk4-unix-print.pc %{_libdir}/pkgconfig/gtk4-x11.pc %{_libdir}/libgtk-4.so -%{_sysconfdir}/rpm/macros.gtk4 +%{_rpmmacrodir}/macros.gtk4 %dir %{_datadir}/gtk-4.0/valgrind %{_datadir}/gtk-4.0/valgrind/gtk.supp