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
This commit is contained in:
Bjørn Lie 2019-05-09 20:24:48 +00:00 committed by Git OBS Bridge
parent 91c2599a54
commit a5dbd77b8b
2 changed files with 8 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 8 09:33:00 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Move RPM macros to %_rpmmacrodir.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 24 09:39:02 UTC 2019 - Martin Liška <mliska@suse.cz> Wed Apr 24 09:39:02 UTC 2019 - Martin Liška <mliska@suse.cz>

View File

@ -33,12 +33,10 @@ Source1: README.SUSE
Source2: settings.ini Source2: settings.ini
Source3: macros.gtk3 Source3: macros.gtk3
Source99: baselibs.conf 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 # 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 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 # 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 Patch1: gtk3-revert-forced-xftdpi.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes 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 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} 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 # Install rpm macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_rpmmacrodir}
cp %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm cp %{SOURCE3} %{buildroot}%{_rpmmacrodir}
%fdupes %{buildroot}%{_datadir} %fdupes %{buildroot}%{_datadir}
%fdupes %{buildroot}%{_libdir} %fdupes %{buildroot}%{_libdir}
@ -679,7 +677,7 @@ fi
%{_libdir}/libgailutil-3.so %{_libdir}/libgailutil-3.so
%{_libdir}/libgdk-3.so %{_libdir}/libgdk-3.so
%{_libdir}/libgtk-3.so %{_libdir}/libgtk-3.so
%{_sysconfdir}/rpm/macros.gtk3 %{_rpmmacrodir}/macros.gtk3
%files -n gettext-its-%{name} %files -n gettext-its-%{name}
%dir %{_datadir}/gettext/ %dir %{_datadir}/gettext/