[rhythmbox: 3/3] Drop gnome-icon-theme dependency on F21+

Kalev Lember kalev at fedoraproject.org
Wed May 7 14:24:05 UTC 2014


commit 1902eac7fca35409413fc0a0149e3a4045b5188c
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed May 7 16:18:24 2014 +0200

    Drop gnome-icon-theme dependency on F21+
    
    In F21, adwaita-icon-theme replaces gnome-icon-theme, and is always
    pulled in by gtk3.
    
    I'm doing the dependency changes in a conditional for now because we are
    likely to use the same spec file for next rhythmbox F20 update.

 rhythmbox.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/rhythmbox.spec b/rhythmbox.spec
index 524512d..f2ad65e 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -4,7 +4,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 3.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -15,11 +15,14 @@ Source: http://download.gnome.org/sources/rhythmbox/3.0/%{name}-%{version}.tar.x
 # https://bugzilla.redhat.com/show_bug.cgi?id=1082543
 Patch0: 0001-display-page-menu-fix-off-by-one-errors.patch
 
+%if 0%{?fedora} < 21
+Requires: gnome-icon-theme-extras
 Requires: gnome-icon-theme-legacy
+%endif
 Requires: gtk3%{?_isa} >= %{gtk3_version}
+Requires: gvfs-afc
 Requires: libdmapsharing%{?_isa} >= %{libdmapsharing_version}
 Requires: media-player-info
-Requires: gvfs-afc gnome-icon-theme-extras
 Requires: python3-gobject
 Requires: python3-mako
 
@@ -188,6 +191,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Wed May 07 2014 Kalev Lember <kalevlember at gmail.com> - 3.0.2-3
+- Drop gnome-icon-theme dependency on F21+
+
 * Wed May 07 2014 Kalev Lember <kalevlember at gmail.com> - 3.0.2-2
 - Backport upstream fix for the previous issue
 


More information about the scm-commits mailing list