From a5dbd77b8bcdf33941f46991ad13b7fa7abbef4387f6b1143ccee18e5a5ea687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 9 May 2019 20:24:48 +0000 Subject: [PATCH] Accepting request 701529 from GNOME:Next Move RPM macros to %_rpmmacrodir. OBS-URL: https://build.opensuse.org/request/show/701529 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=352 --- gtk3.changes | 5 +++++ gtk3.spec | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gtk3.changes b/gtk3.changes index 49a0242..29ff913 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 8 09:33:00 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + ------------------------------------------------------------------- Wed Apr 24 09:39:02 UTC 2019 - Martin Liška diff --git a/gtk3.spec b/gtk3.spec index d0e0b13..f7da0e2 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -33,12 +33,10 @@ Source1: README.SUSE Source2: settings.ini Source3: macros.gtk3 Source99: baselibs.conf - # PATCH-FIX-OPENSUSE gtk3-GTK_PATH64.patch sbrabec@novell.com - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH Patch0: gtk3-GTK_PATH64.patch # PATCH-FIX-OPENSUSE gtk3-revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96 Patch1: gtk3-revert-forced-xftdpi.patch - BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -411,8 +409,8 @@ ln -s -f %{_sysconfdir}/alternatives/gtk-update-icon-cache %{buildroot}%{_bindir mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 %{buildroot}%{_mandir}/man1/gtk-update-icon-cache-3.0.1 ln -s -f %{_sysconfdir}/alternatives/gtk-update-icon-cache.1%{ext_man} %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1%{ext_man} # 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} @@ -679,7 +677,7 @@ fi %{_libdir}/libgailutil-3.so %{_libdir}/libgdk-3.so %{_libdir}/libgtk-3.so -%{_sysconfdir}/rpm/macros.gtk3 +%{_rpmmacrodir}/macros.gtk3 %files -n gettext-its-%{name} %dir %{_datadir}/gettext/