From 6095d06f09cc1b6875173b33ac3c65d47f69e952a25a3e46fc3dbccfdc08942a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 15 Oct 2010 10:40:09 +0000 Subject: [PATCH] Accepting request 50736 from GNOME:Factory checked in (request 50736) OBS-URL: https://build.opensuse.org/request/show/50736 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/hicolor-icon-theme?expand=0&rev=20 --- hicolor-icon-theme.changes | 6 ---- macros.hicolor | 56 +++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/hicolor-icon-theme.changes b/hicolor-icon-theme.changes index 97f3715..253c420 100644 --- a/hicolor-icon-theme.changes +++ b/hicolor-icon-theme.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Thu Oct 7 14:51:55 CEST 2010 - vuntz@opensuse.org - -- Reformat macros.hicolor so that the generated scriptlet looks a - bit nicer. - ------------------------------------------------------------------- Wed Aug 25 15:06:12 CEST 2010 - vuntz@opensuse.org diff --git a/macros.hicolor b/macros.hicolor index 8ac6f49..b4177aa 100644 --- a/macros.hicolor +++ b/macros.hicolor @@ -25,39 +25,39 @@ # ### -%icon_theme_cache_create_ghost() \ -if test "x%1" == "x%%1"; then \ - echo "Missing argument in call to %%icon_theme_cache_create_ghost." \ - false \ -fi \ -mkdir -p "%{buildroot}%{_datadir}/icons/%1" \ +%icon_theme_cache_create_ghost() \ +if test "x%1" == "x%%1"; then \ + echo "Missing argument in call to %%icon_theme_cache_create_ghost." \ + false \ +fi \ +mkdir -p "%{buildroot}%{_datadir}/icons/%1" \ touch "%{buildroot}%{_datadir}/icons/%1/icon-theme.cache" # On install, update the icon cache -%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 \ -elif test -x %{_bindir}/gtk-update-icon-cache-3.0; then \ - %{_bindir}/gtk-update-icon-cache-3.0 --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \ +%icon_theme_cache_post() \ +%if "x%1" != "x%%1" \ + ICON_THEME="%1" \ +%else \ + ICON_THEME="hicolor" \ +%endif \ +if test -x /usr/bin/gtk-update-icon-cache; then \ + /usr/bin/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \ +elif test -x /usr/bin/gtk-update-icon-cache-3.0; then \ + /usr/bin/gtk-update-icon-cache-3.0 --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \ fi # On uninstall, update the icon cache. Note: we ignore upgrades (already # handled in %post of the new package). -%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 \ - elif test -x %{_bindir}/gtk-update-icon-cache-3.0; then \ - %{_bindir}/gtk-update-icon-cache-3.0 --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \ - fi \ +%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 /usr/bin/gtk-update-icon-cache; then \ + /usr/bin/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \ + elif test -x /usr/bin/gtk-update-icon-cache-3.0; then \ + /usr/bin/gtk-update-icon-cache-3.0 --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \ + fi \ fi