home:ketheriel:branches:openSUSE:11.4:Contrib/chromium -> openSUSE:11.4:Contrib/chromium
https://build.opensuse.org/request/diff/76146 Description: Fix for bnc#705223 - Icons are now installed on hicolor and not on oxygen, following Free Desktop Standards. changes files: -------------- --- chromium.changes +++ chromium.changes @@ -1,0 +2,11 @@ +Tue Jul 12 02:26:20 UTC 2011 - [email protected] + +- Fix for bnc#705223: + + Icons are installed in hicolor instead of oxygen, this ensures + compatibility with open Desktop standards. + + Add GTK icon cache update for >= 1140 on %post and %postun. + + Removed the .png in %{_datadir}/pixmaps as hicolor is a better + option. + + Add hicolor-icon-theme to BuildRequires and Requires. + +------------------------------------------------------------------- spec files: ----------- --- chromium.spec +++ chromium.spec @@ -8,7 +8,7 @@ Name: chromium Version: 14.0.792.0 -Release: 1 +Release: 2 License: BSD Summary: Google's opens source browser project Group: Productivity/Networking/Web/Browsers @@ -87,6 +87,9 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gperf +# Add hicolor-icon-theme as BR for directory ownership, icons are now +# installed on hicolor and not on oxygen (free desktop standards). +BuildRequires: hicolor-icon-theme BuildRequires: hunspell-devel BuildRequires: libbz2-devel BuildRequires: libevent @@ -133,6 +136,9 @@ %endif BuildRequires: speex-devel +# We want hicolor installed (Free Desktop Standard) +Requires: hicolor-icon-theme + Requires: alsa Requires: xdg-utils Requires: libv8-3 = %{v8_ver} @@ -250,12 +256,15 @@ %fdupes %{buildroot}%{_mandir}/man1/ popd -mkdir -p %{buildroot}%{_datadir}/pixmaps/ -cp -a src/chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium-browser.png +# Warning: This is deprecated and changes were made to use hicolor. +# It's up for the maintainer of the package to decide if keep or nuke. +#mkdir -p %{buildroot}%{_datadir}/pixmaps/ +#cp -a src/chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium-browser.png mkdir -p %{buildroot}%{_datadir}/icons/ pushd %{buildroot}%{_datadir}/icons/ tar -xjf %{SOURCE104} +mv oxygen hicolor popd mkdir -p %{buildroot}%{_datadir}/applications/ @@ -277,6 +286,15 @@ %clean rm -rf %{buildroot} +# Add snipplets to update the GTK cache on package install. +%if 0%{?suse_version} >= 1140 +%post +%icon_theme_cache_post + +%postun +%icon_theme_cache_postun +%endif + # Files! %files @@ -291,10 +309,11 @@ %{_libdir}/chromium/resources/ %{_libdir}/chromium/xdg-settings %{_mandir}/man1/chrom* -%{_datadir}/pixmaps/chromium-browser.png +# Using icons on hicolor, deprecating the deprecated pixmaps folder +#%{_datadir}/pixmaps/chromium-browser.png %{_datadir}/applications/*.desktop %{_datadir}/gnome-control-center/default-apps/chromium-browser.xml -%{_datadir}/icons/oxygen/ +%{_datadir}/icons/hicolor/ %{_libdir}/chromium/chrome.pak %{_libdir}/chromium/resources.pak %{_libdir}/chromium/locales/ other changes: -------------- To REVIEW against the previous version: osc request show --diff 76146 To ACCEPT the request: osc request accept 76146 --message="reviewed ok." To DECLINE the request: osc request decline 76146 --message="declined for reason xyz (see ... for background / policy / ...)." To REVOKE the request: osc request revoke 76146 --message="retracted because ..., sorry / thx / see better version ..." -- Hermes messaging (http://hermes.opensuse.org) openSUSE Build Service (https://build.opensuse.org/) Collaboration: http://en.opensuse.org/Build_Service/Collaboration -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
