From 2cf2f5a47b2dfea0b24bbc7f5d78dbb3e463ae59 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Oct 12 2016 21:48:23 +0000 Subject: Update to 3.22.2 --- diff --git a/.gitignore b/.gitignore index 6842367..2d598af 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ /gnome-themes-standard-3.20.tar.xz /gnome-themes-standard-3.20.2.tar.xz /gnome-themes-standard-3.22.1.tar.xz +/gnome-themes-standard-3.22.2.tar.xz diff --git a/0001-Install-Adwaita-dark-css-file-in-the-right-directory.patch b/0001-Install-Adwaita-dark-css-file-in-the-right-directory.patch new file mode 100644 index 0000000..de9b6ca --- /dev/null +++ b/0001-Install-Adwaita-dark-css-file-in-the-right-directory.patch @@ -0,0 +1,22 @@ +From ae703a57261c26ad9f7dd328fd110046a7456bbd Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Wed, 12 Oct 2016 23:37:49 +0200 +Subject: [PATCH] Install Adwaita-dark css file in the right directory + +--- + themes/Adwaita-dark/gtk-3.0/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/themes/Adwaita-dark/gtk-3.0/Makefile.am b/themes/Adwaita-dark/gtk-3.0/Makefile.am +index bc0a73e..5cbcf63 100644 +--- a/themes/Adwaita-dark/gtk-3.0/Makefile.am ++++ b/themes/Adwaita-dark/gtk-3.0/Makefile.am +@@ -1,4 +1,4 @@ +-themedir = $(datadir)/themes/Adwaita/gtk-3.0 ++themedir = $(datadir)/themes/Adwaita-dark/gtk-3.0 + + theme_DATA = gtk.css + +-- +2.7.4 + diff --git a/gnome-themes-standard.spec b/gnome-themes-standard.spec index 4c5a3a5..03ac820 100644 --- a/gnome-themes-standard.spec +++ b/gnome-themes-standard.spec @@ -2,7 +2,7 @@ %global gtk3_version 3.9.12 Name: gnome-themes-standard -Version: 3.22.1 +Version: 3.22.2 Release: 1%{?dist} Summary: Standard themes for GNOME applications @@ -11,6 +11,9 @@ URL: http://git.gnome.org/browse/gnome-themes-standard Source0: http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz Source2: gtkrc +# Backported from upstream +Patch0: 0001-Install-Adwaita-dark-css-file-in-the-right-directory.patch + Obsoletes: fedora-gnome-theme <= 15.0-1.fc15 Provides: fedora-gnome-theme = 1:%{version}-%{release} @@ -43,6 +46,7 @@ with a GNOME look and feel. %prep %setup -q +%patch0 -p1 %build %configure @@ -85,6 +89,7 @@ done %{_datadir}/icons/HighContrast/index.theme %ghost %{_datadir}/icons/HighContrast/icon-theme.cache %{_datadir}/themes/Adwaita/gtk-3.0/ +%{_datadir}/themes/Adwaita-dark/gtk-3.0/ %{_datadir}/themes/HighContrast/gtk-3.0/ %files -n adwaita-gtk2-theme @@ -95,11 +100,17 @@ done %dir %{_datadir}/themes/Adwaita %{_datadir}/themes/Adwaita/gtk-2.0/ %{_datadir}/themes/Adwaita/index.theme +%dir %{_datadir}/themes/Adwaita-dark +%{_datadir}/themes/Adwaita-dark/gtk-2.0/ +%{_datadir}/themes/Adwaita-dark/index.theme %dir %{_datadir}/themes/HighContrast %{_datadir}/themes/HighContrast/gtk-2.0/ %{_datadir}/themes/HighContrast/index.theme %changelog +* Wed Oct 12 2016 Kalev Lember - 3.22.2-1 +- Update to 3.22.2 + * Tue Oct 04 2016 Kalev Lember - 3.22.1-1 - Update to 3.22.1 - Don't set group tags diff --git a/sources b/sources index 7c29d32..5331314 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0497b97b03530c76083a03090233867c gnome-themes-standard-3.22.1.tar.xz +84624dbcecab7add32672abae030314d gnome-themes-standard-3.22.2.tar.xz