From 3817741267647c4812c474e54c4f3815bba271d4ef06db67612386c8259c99da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 9 May 2019 20:24:33 +0000 Subject: [PATCH] Accepting request 701531 from GNOME:Next Move RPM macros to %_rpmmacrodir. OBS-URL: https://build.opensuse.org/request/show/701531 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=158 --- gdk-pixbuf.changes | 5 +++++ gdk-pixbuf.spec | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index a5d9a59..fcd49ef 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 8 09:33:53 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + ------------------------------------------------------------------- Thu Feb 28 17:49:05 UTC 2019 - Bjørn Lie diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 1bb9819..0a29219 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -25,13 +25,11 @@ Summary: An image loading library License: LGPL-2.1-or-later Group: Development/Libraries/GNOME URL: https://www.gnome.org/ - Source0: https://download.gnome.org/sources/gdk-pixbuf/2.38/%{name}-%{version}.tar.xz Source1: macros.gdk-pixbuf Source2: README.SUSE Source3: gdk-pixbuf-rpmlintrc Source99: baselibs.conf - BuildRequires: docbook-xsl-stylesheets BuildRequires: gtk-doc BuildRequires: libjpeg-devel @@ -160,8 +158,8 @@ touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders mv %{buildroot}%{_mandir}/man1/gdk-pixbuf-query-loaders.1 %{buildroot}%{_mandir}/man1/gdk-pixbuf-query-loaders-64.1 %endif # Install rpm macros -mkdir -p %{buildroot}%{_sysconfdir}/rpm -cp %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm +mkdir -p %{buildroot}%{_rpmmacrodir} +cp %{SOURCE1} %{buildroot}%{_rpmmacrodir} ############################################################################# # Note: when updating scriptlets, don't forget to also update baselibs.conf # @@ -248,7 +246,7 @@ fi %{_datadir}/gir-1.0/GdkPixbuf-2.0.gir %{_datadir}/gir-1.0/GdkPixdata-2.0.gir %doc %{_datadir}/gtk-doc/html/gdk-pixbuf -%{_sysconfdir}/rpm/macros.gdk-pixbuf +%{_rpmmacrodir}/macros.gdk-pixbuf %files lang -f %{name}.lang