From 416840c49db8eb409fb2f910c63f48abf484f625 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Wed, 20 Aug 2014 22:36:53 +0200
Subject: [PATCH] f21, f22: Adapt for gtk3 / adwaita theming changes

adwaita-gtk3-theme package is no more; gtk3 itself now includes the
Adwaita theme. gnome-icon-theme and -symbolic were renamed to
adwaita-icon-theme and merged together into one package, which is now
pulled in by gtk3 package itself. adwaita-cursor-theme is gone too; the
cursors are now included in the new adwaita-icon-theme package.
---
 comps-f21.xml.in | 17 +++--------------
 comps-f22.xml.in | 17 +++--------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 7a89c6fc..69ce280e 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -112,9 +112,6 @@
       <packagereq>gnome-documents</packagereq>
       <packagereq>gnome-font-viewer</packagereq>
       <packagereq>gnome-getting-started-docs</packagereq>
-      <packagereq>gnome-icon-theme</packagereq>
-      <packagereq>gnome-icon-theme-extras</packagereq>
-      <packagereq>gnome-icon-theme-symbolic</packagereq>
       <packagereq>gnome-initial-setup</packagereq>
       <packagereq>gnome-logs</packagereq>
       <packagereq>gnome-maps</packagereq>
@@ -450,9 +447,8 @@
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
-      <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>adwaita-icon-theme</packagereq>
       <packagereq>greybird-gtk2-theme</packagereq>
       <packagereq>greybird-gtk3-theme</packagereq>
       <packagereq>greybird-xfce4-notifyd-theme</packagereq>
@@ -604,9 +600,8 @@
       <packagereq>xpad</packagereq>
       <packagereq>gigolo</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
-      <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>adwaita-icon-theme</packagereq>
       <packagereq>gnome-keyring-pam</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>nm-connection-editor</packagereq>
@@ -685,13 +680,11 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>adwaita-icon-theme</packagereq>
       <packagereq>awesome</packagereq>
       <packagereq>dwm</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
-      <packagereq>gnome-icon-theme-symbolic</packagereq>
       <packagereq>i3</packagereq>
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>lightdm</packagereq>
@@ -739,10 +732,6 @@
       <packagereq>gnome-backgrounds</packagereq>
       <packagereq>gnome-calculator</packagereq>
       <packagereq>gnome-disk-utility</packagereq>
-      <packagereq>gnome-icon-theme</packagereq>
-      <packagereq>gnome-icon-theme-extras</packagereq>
-      <packagereq>gnome-icon-theme-legacy</packagereq>
-      <packagereq>gnome-icon-theme-symbolic</packagereq>
       <packagereq>yumex</packagereq>
       <packagereq>gnome-screenshot</packagereq>
       <packagereq>cinnamon-screensaver</packagereq>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 7a89c6fc..69ce280e 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -112,9 +112,6 @@
       <packagereq>gnome-documents</packagereq>
       <packagereq>gnome-font-viewer</packagereq>
       <packagereq>gnome-getting-started-docs</packagereq>
-      <packagereq>gnome-icon-theme</packagereq>
-      <packagereq>gnome-icon-theme-extras</packagereq>
-      <packagereq>gnome-icon-theme-symbolic</packagereq>
       <packagereq>gnome-initial-setup</packagereq>
       <packagereq>gnome-logs</packagereq>
       <packagereq>gnome-maps</packagereq>
@@ -450,9 +447,8 @@
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
-      <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>adwaita-icon-theme</packagereq>
       <packagereq>greybird-gtk2-theme</packagereq>
       <packagereq>greybird-gtk3-theme</packagereq>
       <packagereq>greybird-xfce4-notifyd-theme</packagereq>
@@ -604,9 +600,8 @@
       <packagereq>xpad</packagereq>
       <packagereq>gigolo</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
-      <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>adwaita-icon-theme</packagereq>
       <packagereq>gnome-keyring-pam</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>nm-connection-editor</packagereq>
@@ -685,13 +680,11 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>adwaita-icon-theme</packagereq>
       <packagereq>awesome</packagereq>
       <packagereq>dwm</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
-      <packagereq>gnome-icon-theme-symbolic</packagereq>
       <packagereq>i3</packagereq>
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>lightdm</packagereq>
@@ -739,10 +732,6 @@
       <packagereq>gnome-backgrounds</packagereq>
       <packagereq>gnome-calculator</packagereq>
       <packagereq>gnome-disk-utility</packagereq>
-      <packagereq>gnome-icon-theme</packagereq>
-      <packagereq>gnome-icon-theme-extras</packagereq>
-      <packagereq>gnome-icon-theme-legacy</packagereq>
-      <packagereq>gnome-icon-theme-symbolic</packagereq>
       <packagereq>yumex</packagereq>
       <packagereq>gnome-screenshot</packagereq>
       <packagereq>cinnamon-screensaver</packagereq>