[gnome-themes-standard] Conflict with older adwaita-gtk3-theme packages

Kalev Lember kalev at fedoraproject.org
Tue Sep 2 23:26:07 UTC 2014


commit b79fc190d6a36785a9429b65a134d2ff38df0472
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Sep 2 10:13:15 2014 +0200

    Conflict with older adwaita-gtk3-theme packages
    
    /usr/share/themes/Adwaita/gtk-3.0/gtk.css moved at one point from
    adwaita-gtk3-theme to gnome-themes-standard. Add explicit conflicts so
    that yum / dnf know to avoid the combination of old adwaita-gtk3-theme
    and new gnome-themes-standard instead of running into file conflicts.
    
    This should not happen during normal operation because
    adwaita-gtk3-theme is correctly obsoleted by gtk3. However, yum with
    --skip-broken can end up not pulling in gtk3 to the transaction set; in
    that case the explicit conflicts help it avoid the broken combination.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1133372

 gnome-themes-standard.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/gnome-themes-standard.spec b/gnome-themes-standard.spec
index 37cfcdf..12b2e26 100644
--- a/gnome-themes-standard.spec
+++ b/gnome-themes-standard.spec
@@ -3,7 +3,7 @@
 
 Name: gnome-themes-standard
 Version: 3.13.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Standard themes for GNOME applications
 
 Group: User Interface/Desktops
@@ -28,6 +28,8 @@ Requires: abattis-cantarell-fonts
 Requires: adwaita-gtk2-theme = %{version}-%{release}
 Requires: adwaita-icon-theme
 
+Conflicts: adwaita-gtk3-theme < 3.13.3
+
 %description
 The gnome-themes-standard package contains the standard theme for the GNOME
 desktop, which provides default appearance for cursors, desktop background,
@@ -92,6 +94,9 @@ done
 %{_datadir}/gtk-2.0/gtkrc
 
 %changelog
+* Tue Sep 02 2014 Kalev Lember <kalevlember at gmail.com> - 3.13.90-2
+- Conflict with older adwaita-gtk3-theme packages (#1133372)
+
 * Fri Aug 22 2014 Kalev Lember <kalevlember at gmail.com> - 3.13.90-1
 - Update to 3.13.90
 


More information about the scm-commits mailing list