diff --git a/.gitignore b/.gitignore
index 9152e6f..62e43c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/gnome-themes-standard-3.8.4.tar.xz
+SOURCES/gnome-themes-standard-3.14.2.2.tar.xz
diff --git a/.gnome-themes-standard.metadata b/.gnome-themes-standard.metadata
index a8f7db0..4ffbefd 100644
--- a/.gnome-themes-standard.metadata
+++ b/.gnome-themes-standard.metadata
@@ -1 +1 @@
-e5f54432db3487780121153ca61a7fbc7c74cda3 SOURCES/gnome-themes-standard-3.8.4.tar.xz
+09aaa67c179f223aad479c957aacbb0de538ab56 SOURCES/gnome-themes-standard-3.14.2.2.tar.xz
diff --git a/SOURCES/metacity-theme-2.xml b/SOURCES/metacity-theme-2.xml
new file mode 100644
index 0000000..6d21d88
--- /dev/null
+++ b/SOURCES/metacity-theme-2.xml
@@ -0,0 +1,1604 @@
+
+
+
+ Adwaita
+ GNOME Art Team <art.gnome.org>
+ Â Intel, Â Red Hat, Lapo Calamandrei
+ 2010
+ Default GNOME 3 window theme
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SPECS/gnome-themes-standard.spec b/SPECS/gnome-themes-standard.spec
index 680b8ab..ec8c932 100644
--- a/SPECS/gnome-themes-standard.spec
+++ b/SPECS/gnome-themes-standard.spec
@@ -1,17 +1,18 @@
%global gtk2_version 2.24.15
-%global gtk3_version 3.6.2
+%global gtk3_version 3.9.3
Name: gnome-themes-standard
-Version: 3.8.4
-Release: 3%{?dist}
+Version: 3.14.2.2
+Release: 2%{?dist}
Summary: Standard themes for GNOME applications
Group: User Interface/Desktops
License: LGPLv2+
URL: http://git.gnome.org/browse/gnome-themes-standard
-Source0: http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz
Source1: settings.ini
Source2: gtkrc
+Source3: metacity-theme-2.xml
Obsoletes: fedora-gnome-theme <= 15.0-1.fc15
Provides: fedora-gnome-theme = 1:%{version}-%{release}
@@ -25,26 +26,17 @@ BuildRequires: librsvg2-devel
BuildRequires: intltool gettext autoconf automake libtool
# for gtk-update-icon-cache
BuildRequires: gtk2
-Requires: gnome-icon-theme
Requires: abattis-cantarell-fonts
-Requires: adwaita-cursor-theme = %{version}-%{release}
Requires: adwaita-gtk2-theme = %{version}-%{release}
-Requires: adwaita-gtk3-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,
window borders and GTK+ applications.
-%package -n adwaita-cursor-theme
-Summary: Adwaita cursor theme
-Group: User Interface/Desktops
-BuildArch: noarch
-
-%description -n adwaita-cursor-theme
-The adwaita-cursor-theme package contains a modern set of cursors originally
-designed for the GNOME desktop.
-
%package -n adwaita-gtk2-theme
Summary: Adwaita gtk2 theme
Group: User Interface/Desktops
@@ -54,15 +46,6 @@ Requires: gtk2%{_isa} >= %{gtk2_version}
The adwaita-gtk2-theme package contains a gtk2 theme for presenting widgets
with a GNOME look and feel.
-%package -n adwaita-gtk3-theme
-Summary: Adwaita gtk3 theme
-Group: User Interface/Desktops
-Requires: gtk3%{_isa} >= %{gtk3_version}
-
-%description -n adwaita-gtk3-theme
-The adwaita-gtk3-theme package contains a gtk3 theme for rendering widgets
-with a GNOME look and feel.
-
%prep
%setup -q
@@ -73,18 +56,22 @@ make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
+for s in 16x16 22x22 24x24 32x32 48x48 256x256; do
+ cp $RPM_BUILD_ROOT%{_datadir}/icons/HighContrast/$s/apps/liveinst.png $RPM_BUILD_ROOT%{_datadir}/icons/HighContrast/$s/apps/anaconda.png
+done
+
for t in HighContrast; do
rm -f $RPM_BUILD_ROOT%{_datadir}/icons/$t/icon-theme.cache
touch $RPM_BUILD_ROOT%{_datadir}/icons/$t/icon-theme.cache
done
-rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/3.0.0/theming-engines/libadwaita.la
rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.10.0/engines/libadwaita.la
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0
-cp $RPM_SOURCE_DIR/settings.ini $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0/settings.ini
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
-cp $RPM_SOURCE_DIR/gtkrc $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtkrc
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-2.0
+cp $RPM_SOURCE_DIR/gtkrc $RPM_BUILD_ROOT%{_datadir}/gtk-2.0/gtkrc
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes/Adwaita/metacity-1
+cp $RPM_SOURCE_DIR/metacity-theme-2.xml $RPM_BUILD_ROOT%{_datadir}/themes/Adwaita/metacity-1
%post
for t in HighContrast; do
@@ -102,36 +89,28 @@ done
# Background and WM
%{_datadir}/themes/Adwaita
%exclude %{_datadir}/themes/Adwaita/gtk-2.0
-%exclude %{_datadir}/themes/Adwaita/gtk-3.0
-
-# Background
-%{_datadir}/gnome-background-properties/*
# A11y themes
%ghost %{_datadir}/icons/HighContrast/icon-theme.cache
%{_datadir}/icons/HighContrast
%{_datadir}/themes/HighContrast
-%files -n adwaita-cursor-theme
-# Cursors
-%{_datadir}/icons/Adwaita
-
%files -n adwaita-gtk2-theme
# gtk2 Theme and engine
%{_libdir}/gtk-2.0/2.10.0/engines/libadwaita.so
%{_datadir}/themes/Adwaita/gtk-2.0
# Default gtk2 settings
-%{_sysconfdir}/gtk-2.0/gtkrc
+%{_datadir}/gtk-2.0/gtkrc
-%files -n adwaita-gtk3-theme
-# gtk3 Theme and engine
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libadwaita.so
-%{_datadir}/themes/Adwaita/gtk-3.0
-# Default gtk3 settings
-%{_sysconfdir}/gtk-3.0/settings.ini
+%changelog
+* Thu Jun 4 2015 Matthias Clasen - 3.14.2.2-2
+- Keep shipping a metacity theme that works with metacity 3.12
+- Resolves: #1227540
+* Thu Nov 27 2014 Adel Gadllah - 3.14.2.2-1
+- Update to 3.14.2.2
+- Resolves: #1174391
-%changelog
* Fri Jan 24 2014 Daniel Mach - 3.8.4-3
- Mass rebuild 2014-01-24