Accepting request 1073484 from GNOME:Next

- Re-add macros.gtk3: there are quite a few consumers left
  requiring the defined macros.

OBS-URL: https://build.opensuse.org/request/show/1073484
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=430
This commit is contained in:
2023-03-21 09:35:09 +00:00
committed by Git OBS Bridge
parent a459944439
commit a6f88842ed
3 changed files with 47 additions and 0 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 21 08:43:48 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Re-add macros.gtk3: there are quite a few consumers left
requiring the defined macros.
-------------------------------------------------------------------
Tue Mar 7 00:21:45 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>

View File

@@ -39,6 +39,7 @@ URL: https://www.gtk.org/
Source0: %{_name}-%{version}.tar.xz
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
@@ -447,6 +448,10 @@ mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.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}%{_rpmmacrodir}
cp %{SOURCE3} %{buildroot}%{_rpmmacrodir}
%fdupes %{buildroot}%{_datadir}
%fdupes %{buildroot}%{_libdir}
@@ -648,6 +653,7 @@ fi
%{_libdir}/libgailutil-3.so
%{_libdir}/libgdk-3.so
%{_libdir}/libgtk-3.so
%{_rpmmacrodir}/macros.gtk3
%files -n gettext-its-%{name}
%dir %{_datadir}/gettext/

35
macros.gtk3 Normal file
View File

@@ -0,0 +1,35 @@
# RPM macros for packages installing a GTK+ IM module
#
###
#
# When a package installs a GTK+ IM module, it should use all
# three macros:
#
# - %gtk3_immodule_requires in the preamble
# - %gtk3_immodule_post in %post
# - %gtk3_immodule_postun in %postun
#
###
%gtk3_immodule_requires \
Requires(post): gtk3-tools \
Requires(postun): gtk3-tools
# On install, update the cache
%gtk3_immodule_post \
%if "%_lib" == "lib64" \
%{_bindir}/gtk-query-immodules-3.0-64 --update-cache \
%else \
%{_bindir}/gtk-query-immodules-3.0 --update-cache \
%endif
# On uninstall, update the cache. Note: we ignore upgrades (already
# handled in %post of the new package).
%gtk3_immodule_postun \
if [ $1 -eq 0 ]; then \
%if "%_lib" == "lib64" \
%{_bindir}/gtk-query-immodules-3.0-64 --update-cache \
%else \
%{_bindir}/gtk-query-immodules-3.0 --update-cache \
%endif \
fi