1
0

Accepting request 519387 from GNOME:Next

Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/519387
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/hicolor-icon-theme?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger 2017-08-31 07:43:01 +00:00 committed by Git OBS Bridge
parent bde0e21c50
commit 1f01639cf5
3 changed files with 13 additions and 25 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jun 27 12:29:12 UTC 2017 - dimstar@opensuse.org
- Migrate %icon_theme_cache_post/postun macro from
hicolor-icon-theme to gtk2-tools and gtk3-tools file triggers.
The macros are defined to be nop, in order to not break all spec
files for now.
-------------------------------------------------------------------
Thu May 26 14:01:13 UTC 2016 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package hicolor-icon-theme
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -47,9 +47,6 @@ chmod -x COPYING
# Install rpm macros
install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.hicolor
# No %%post/%%postun: there are actually no icons in this package. It's just the
# directory structure.
%files
%defattr(-, root, root)
%doc COPYING ChangeLog README

View File

@ -33,27 +33,10 @@ fi
mkdir -p "%{buildroot}%{_datadir}/icons/%1" \
touch "%{buildroot}%{_datadir}/icons/%1/icon-theme.cache"
# On install, update the icon cache
# The macro is a compatibility place holder to not break .spec files. It has been migrated to be a file trigger
%icon_theme_cache_post() \
%if "x%1" != "x%%1" \
ICON_THEME="%1" \
%else \
ICON_THEME="hicolor" \
%endif \
if test -x %{_bindir}/gtk-update-icon-cache; then \
%{_bindir}/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \
fi
%nil
# On uninstall, update the icon cache. Note: we ignore upgrades (already
# handled in %post of the new package).
# The macro is a compatibility place holder to not break .spec files. It has been migrated to be a file trigger
%icon_theme_cache_postun() \
if [ $1 -eq 0 ]; then \
%if "x%1" != "x%%1" \
ICON_THEME="%1" \
%else \
ICON_THEME="hicolor" \
%endif \
if test -x %{_bindir}/gtk-update-icon-cache; then \
%{_bindir}/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \
fi \
fi
%nil