From 497ef8edfb33ce7f02f1d6ee6d19af94981187e5a95168d555e9a84d037bff7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 9 May 2019 20:25:49 +0000 Subject: [PATCH] Accepting request 701521 from GNOME:Next - Move RPM macros to %_rpmmacrodir. OBS-URL: https://build.opensuse.org/request/show/701521 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/shared-mime-info?expand=0&rev=76 --- shared-mime-info.changes | 5 +++++ shared-mime-info.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/shared-mime-info.changes b/shared-mime-info.changes index df78ad6..66cb41c 100644 --- a/shared-mime-info.changes +++ b/shared-mime-info.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 8 09:02:39 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + ------------------------------------------------------------------- Wed Apr 17 11:30:22 CEST 2019 - kukuk@suse.de diff --git a/shared-mime-info.spec b/shared-mime-info.spec index 8c6ec42..c4eb19a 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -25,7 +25,6 @@ Group: System/X11/Utilities URL: https://gitlab.freedesktop.org/xdg/shared-mime-info/ Source0: %{name}-%{version}.tar.xz Source1: macros.shared-mime-info - BuildRequires: glib2-devel BuildRequires: intltool BuildRequires: libtool @@ -68,7 +67,7 @@ NOCONFIGURE=1 ./autogen.sh %make_install %find_lang %{name} %{?no_lang_C} # Install rpm macros -install -D -m644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.shared-mime-info +install -D -m644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.shared-mime-info %check make %{?_smp_mflags} check @@ -89,7 +88,7 @@ export PKGSYSTEM_ENABLE_FSYNC=0 %{_datadir}/pkgconfig/*.pc %ghost %{_datadir}/mime/[a-ms-vxX]* %{_mandir}/man?/*%{ext_man} -%{_rpmconfigdir}/macros.d/macros.shared-mime-info +%{_rpmmacrodir}/macros.shared-mime-info %files lang -f %{name}.lang