diff --git a/gnome-music.spec b/gnome-music.spec index 905e29c..867ac20 100644 --- a/gnome-music.spec +++ b/gnome-music.spec @@ -5,7 +5,7 @@ Name: gnome-music Summary: Music player and management application for GNOME Version: 3.18.2 -Release: 2%{?dist} +Release: 3%{?dist} # The sources are under the GPLv2+ license, except for: # - the bundled libgd which is LGPLv2+, @@ -17,6 +17,7 @@ URL: http://wiki.gnome.org/Apps/Music Source0: https://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz # Backported from upstream Patch0: 0001-build-Use-grilo-0.3-for-GNOME-3.20.patch +Patch1: symbolic-icon.patch BuildRequires: /usr/bin/appstream-util BuildRequires: desktop-file-utils @@ -62,10 +63,11 @@ Music player and management application for GNOME. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build -# For patch0 +# For patch0, and patch1 too! autoreconf -fi %configure --disable-silent-rules @@ -113,6 +115,7 @@ fi %{_datadir}/applications/%{name}.desktop %{_datadir}/glib-2.0/schemas/org.gnome.Music.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/gnome-music-symbolic.svg %{_datadir}/icons/HighContrast/*/apps/%{name}.png %{_libdir}/%{name} %{_mandir}/man1/%{name}.1* @@ -120,6 +123,9 @@ fi %changelog +* Sat Dec 26 2015 Michael Catanzaro - 3.18.2-3 +- Add symbolic icon + * Fri Dec 18 2015 Kalev Lember - 3.18.2-2 - Build with grilo 0.3 diff --git a/symbolic-icon.patch b/symbolic-icon.patch new file mode 100644 index 0000000..00dd526 --- /dev/null +++ b/symbolic-icon.patch @@ -0,0 +1,146 @@ +From d64c6ab8f21c1c809c8863c4d7bb6d454b33cab4 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Sat, 26 Dec 2015 18:55:16 -0600 +Subject: Add symbolic icon + +By Jakub. This was needed for GNOME 3.16, so we're a bit late.... +--- + data/Makefile.am | 26 +++---------------- + data/icons/HighContrast/16x16/apps/gnome-music.png | Bin 497 -> 0 bytes + data/icons/HighContrast/22x22/apps/gnome-music.png | Bin 780 -> 0 bytes + data/icons/HighContrast/24x24/apps/gnome-music.png | Bin 811 -> 0 bytes + .../HighContrast/256x256/apps/gnome-music.png | Bin 14183 -> 0 bytes + data/icons/HighContrast/32x32/apps/gnome-music.png | Bin 1205 -> 0 bytes + data/icons/HighContrast/48x48/apps/gnome-music.png | Bin 1962 -> 0 bytes + .../hicolor/symbolic/apps/gnome-music-symbolic.svg | 28 +++++++++++++++++++++ + 8 files changed, 31 insertions(+), 23 deletions(-) + delete mode 100644 data/icons/HighContrast/16x16/apps/gnome-music.png + delete mode 100644 data/icons/HighContrast/22x22/apps/gnome-music.png + delete mode 100644 data/icons/HighContrast/24x24/apps/gnome-music.png + delete mode 100644 data/icons/HighContrast/256x256/apps/gnome-music.png + delete mode 100644 data/icons/HighContrast/32x32/apps/gnome-music.png + delete mode 100644 data/icons/HighContrast/48x48/apps/gnome-music.png + create mode 100644 data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg + +diff --git a/data/Makefile.am b/data/Makefile.am +index c1b8a13..b1c9c88 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -29,45 +29,26 @@ hicolor_icon48dir = $(datadir)/icons/hicolor/48x48/apps + hicolor_icon48_DATA = icons/hicolor/48x48/apps/gnome-music.png + hicolor_icon256dir = $(datadir)/icons/hicolor/256x256/apps + hicolor_icon256_DATA = icons/hicolor/256x256/apps/gnome-music.png ++hicolor_iconsymbolicdir = $(datadir)/icons/hicolor/symbolic/apps ++hicolor_iconsymbolic_DATA = icons/hicolor/symbolic/apps/gnome-music-symbolic.svg + hicolor_icon_files = \ + $(hicolor_icon16_DATA) \ + $(hicolor_icon22_DATA) \ + $(hicolor_icon32_DATA) \ + $(hicolor_icon48_DATA) \ + $(hicolor_icon256_DATA) \ ++ $(hicolor_iconsymbolic_DATA) \ + icons/hicolor/gnome-music.svg + +-hicontrast_icon16dir = $(datadir)/icons/HighContrast/16x16/apps +-hicontrast_icon16_DATA = icons/HighContrast/16x16/apps/gnome-music.png +-hicontrast_icon22dir = $(datadir)/icons/HighContrast/22x22/apps +-hicontrast_icon22_DATA = icons/HighContrast/22x22/apps/gnome-music.png +-hicontrast_icon32dir = $(datadir)/icons/HighContrast/32x32/apps +-hicontrast_icon32_DATA = icons/HighContrast/32x32/apps/gnome-music.png +-hicontrast_icon48dir = $(datadir)/icons/HighContrast/48x48/apps +-hicontrast_icon48_DATA = icons/HighContrast/48x48/apps/gnome-music.png +-hicontrast_icon256dir = $(datadir)/icons/HighContrast/256x256/apps +-hicontrast_icon256_DATA = icons/HighContrast/256x256/apps/gnome-music.png +-hicontrast_icon_files = \ +- $(hicontrast_icon16_DATA) \ +- $(hicontrast_icon22_DATA) \ +- $(hicontrast_icon32_DATA) \ +- $(hicontrast_icon48_DATA) \ +- $(hicontrast_icon256_DATA) +- +-gtk_update_hicontrast_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/HighContrast +- + install-data-hook: update-icon-cache + uninstall-hook: update-icon-cache + update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk hicolor icon cache."; \ + $(gtk_update_hicolor_icon_cache); \ +- echo "Updating Gtk highcontrast icon cache."; \ +- $(gtk_update_hicontrast_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_hicolor_icon_cache)"; \ +- echo "*** $(gtk_update_hicontrast_icon_cache)"; \ + fi + + +@@ -81,7 +62,6 @@ gschemas.compiled: $(gsettings_SCHEMAS) Makefile + + EXTRA_DIST = \ + $(hicolor_icon_files) \ +- $(hicontrast_icon_files) \ + $(resource_files) \ + gnome-music.appdata.xml.in \ + gnome-music.desktop.in \ +diff --git a/data/icons/HighContrast/16x16/apps/gnome-music.png b/data/icons/HighContrast/16x16/apps/gnome-music.png +deleted file mode 100644 +index 718b9be..0000000 +Binary files a/data/icons/HighContrast/16x16/apps/gnome-music.png and /dev/null differ +diff --git a/data/icons/HighContrast/22x22/apps/gnome-music.png b/data/icons/HighContrast/22x22/apps/gnome-music.png +deleted file mode 100644 +index 5956a63..0000000 +Binary files a/data/icons/HighContrast/22x22/apps/gnome-music.png and /dev/null differ +diff --git a/data/icons/HighContrast/24x24/apps/gnome-music.png b/data/icons/HighContrast/24x24/apps/gnome-music.png +deleted file mode 100644 +index a1985a4..0000000 +Binary files a/data/icons/HighContrast/24x24/apps/gnome-music.png and /dev/null differ +diff --git a/data/icons/HighContrast/256x256/apps/gnome-music.png b/data/icons/HighContrast/256x256/apps/gnome-music.png +deleted file mode 100644 +index 2fc4940..0000000 +Binary files a/data/icons/HighContrast/256x256/apps/gnome-music.png and /dev/null differ +diff --git a/data/icons/HighContrast/32x32/apps/gnome-music.png b/data/icons/HighContrast/32x32/apps/gnome-music.png +deleted file mode 100644 +index d307230..0000000 +Binary files a/data/icons/HighContrast/32x32/apps/gnome-music.png and /dev/null differ +diff --git a/data/icons/HighContrast/48x48/apps/gnome-music.png b/data/icons/HighContrast/48x48/apps/gnome-music.png +deleted file mode 100644 +index 4e4e076..0000000 +Binary files a/data/icons/HighContrast/48x48/apps/gnome-music.png and /dev/null differ +diff --git a/data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg b/data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg +new file mode 100644 +index 0000000..95db22b +--- /dev/null ++++ b/data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg +@@ -0,0 +1,28 @@ ++ ++ ++ ++ ++ ++ ++ ++ image/svg+xml ++ ++ Gnome Symbolic Icon Theme ++ ++ ++ ++ ++ ++ ++ Gnome Symbolic Icon Theme ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +-- +cgit v0.11.2 +