Accepting request 325443 from home:badshah400:test42

Fix build failures on 42, by actually installing necessary icon files to hicolor icon dir; BR on gnome-icon-theme

OBS-URL: https://build.opensuse.org/request/show/325443
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=200
This commit is contained in:
Dominique Leuenberger 2015-09-03 10:19:51 +00:00 committed by Git OBS Bridge
parent af065c961b
commit cac61d58aa
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Aug 23 04:02:46 UTC 2015 - badshah400@gmail.com
- Add BuildRequires on gnome-icon-theme (which really
provides the web-browser.png icon); copy relevant icons from
the gnome-icon-theme dir into the hicolor-icon-theme dir and
package these files to fix builds for openSUSE:42.
-------------------------------------------------------------------
Thu Jul 9 13:58:30 UTC 2015 - zaitor@opensuse.org

View File

@ -30,6 +30,7 @@ Patch0: epiphany-safe-one-click-install.patch
# The icon we rely on is from adwaita-icon-theme
BuildRequires: adwaita-icon-theme
BuildRequires: fdupes
BuildRequires: gnome-icon-theme
BuildRequires: intltool >= 0.50
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
@ -129,7 +130,7 @@ find %{buildroot} -type f -name '*.la' -delete -print
%suse_update_desktop_file %{name}
# Copy the icons in hicolor, else brp-check is sad
for size in 8x8 16x16 22x22 24x24 32x32 48x48 256x256; do
if test -f %{_datadir}/icons/gnome/$size/apps/web-browser.png; then
if test -f %{_datadir}/icons/gnome/${size}/apps/web-browser.png; then
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/$size/apps
cp -a %{_datadir}/icons/gnome/$size/apps/web-browser.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/web-browser.png
fi
@ -168,6 +169,7 @@ done
%dir %{_libdir}/epiphany/%{_base_version}
%dir %{_libdir}/epiphany/%{_base_version}/web-extensions
%{_libdir}/epiphany/%{_base_version}/web-extensions/libephywebextension.so
%{_datadir}/icons/hicolor/*/apps/web-browser.png
%files lang -f %{name}.lang