From 22a2a12b43940b4ee8305ae4181c984954cccc88d6e39afd79e608c01a43be5e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 10 May 2019 10:22:18 +0000 Subject: [PATCH] Accepting request 701523 from GNOME:Next - Move RPM macros to %_rpmmacrodir. OBS-URL: https://build.opensuse.org/request/show/701523 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=199 --- pango.changes | 5 +++++ pango.spec | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pango.changes b/pango.changes index 863ca0b..76107b6 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 8 09:28:33 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + ------------------------------------------------------------------- Thu Jan 3 22:54:42 UTC 2019 - bjorn.lie@gmail.com diff --git a/pango.spec b/pango.spec index 583c5dd..8ddf4c1 100644 --- a/pango.spec +++ b/pango.spec @@ -26,7 +26,6 @@ URL: http://www.pango.org/ Source0: https://download.gnome.org/sources/pango/1.43/%{name}-%{version}.tar.xz Source2: macros.pango Source99: baselibs.conf - BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: help2man @@ -130,8 +129,8 @@ to develop applications that require these. %install %meson_install # Install rpm macros -mkdir -p %{buildroot}%{_sysconfdir}/rpm -cp %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm +mkdir -p %{buildroot}%_rpmmacrodir +cp %{SOURCE2} %{buildroot}%_rpmmacrodir # Remove tests, we have no need for them - FIXME if any one can figure out how to disable build of these with meson == awesome rm -rf %{buildroot}%{_libexecdir}/installed-tests rm -rf %{buildroot}%{_datadir}/installed-tests @@ -162,6 +161,6 @@ rm -rf %{buildroot}%{_datadir}/installed-tests %{_libdir}/pkgconfig/*.pc %{_includedir}/pango-1.0/ %{_datadir}/gir-1.0/*.gir -%{_sysconfdir}/rpm/macros.pango +%_rpmmacrodir/macros.pango %changelog