diff --git a/hicolor-icon-theme-rpmlintrc b/hicolor-icon-theme-rpmlintrc deleted file mode 100644 index 9cae743..0000000 --- a/hicolor-icon-theme-rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter(".*ghost-files-without-postin") diff --git a/hicolor-icon-theme.changes b/hicolor-icon-theme.changes index 253c420..85dc81d 100644 --- a/hicolor-icon-theme.changes +++ b/hicolor-icon-theme.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Wed Aug 25 15:06:12 CEST 2010 - vuntz@opensuse.org - -- Add rpm macros to update icon themes. -- Add a %ghost file for the hicolor icon cache, but since this - package actually doesn't contain any icon, do not do anything in - %post/%postun: this will be done by packages installing icons in - the hicolor icon theme. -- Add a rpmlintrc file to suppress the ghost-files-without-postin - warning which is wrong in this specific case. - ------------------------------------------------------------------- Thu Jan 14 05:22:00 CET 2010 - captain.magnus@opensuse.org diff --git a/hicolor-icon-theme.spec b/hicolor-icon-theme.spec index 0b30ad9..9b799b0 100644 --- a/hicolor-icon-theme.spec +++ b/hicolor-icon-theme.spec @@ -26,8 +26,6 @@ Version: 0.12 Release: 1 Url: http://icon-theme.freedesktop.org/wiki/HicolorTheme Source: %{name}-%{version}.tar.bz2 -Source1: macros.hicolor -Source99: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM hicolor-scalable-sizes.patch fdo25449 vuntz@opensuse.org -- Add some MinSize for scalable, since the icons won't look that good at small sizes Patch1: hicolor-scalable-sizes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,22 +45,14 @@ theme specification. %install %makeinstall -touch %{buildroot}%{_datadir}/icons/hicolor/icon-theme.cache chmod -x COPYING -# Install rpm macros -install -D -m644 %{S:1} %{buildroot}%{_sysconfdir}/rpm/macros.hicolor %clean rm -rf %{buildroot} -# 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 -%ghost %{_datadir}/icons/hicolor/icon-theme.cache %{_datadir}/icons/hicolor/ -%{_sysconfdir}/rpm/macros.hicolor %changelog diff --git a/macros.hicolor b/macros.hicolor deleted file mode 100644 index b4177aa..0000000 --- a/macros.hicolor +++ /dev/null @@ -1,63 +0,0 @@ -# RPM macros for packages installing icons or a whole icon theme -# -### -# -# When a package installs icons (or a whole icon theme), it should use -# both macros: -# -# - %icon_theme_cache_post in %post -# - %icon_theme_cache_postun in %postun -# -# Additionally, if a package installs a whole icon theme, it should use -# this macro: -# -# - %icon_theme_cache_create_ghost in %install -# -# This macro takes the name of an icon theme as argument. The -# icon-theme.cache created this way should be added with %ghost in the -# file list. -# -# Note that %icon_theme_cache_post and %icon_theme_cache_postun can -# optionally take the name of the icon theme where icons are installed. -# This is useful for packages containing a whole icon theme. If no -# argument is passed, the hicolor icon theme is assumed (which is where -# applications usually install their icons). -# -### - -%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 /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 /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