Merge branch 'f27' into epel7epel7

3 files changed, 17 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index d2f1345..b3b6987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /gnome-flashback-3.20.2.tar.xz
 /gnome-flashback-3.22.0.tar.xz
 /gnome-flashback-3.22.1.tar.xz
+/gnome-flashback-3.24.0.tar.xz
+/gnome-flashback-3.26.0.tar.xz
diff --git a/gnome-flashback.spec b/gnome-flashback.spec
index f50909f..11648cd 100644
--- a/gnome-flashback.spec
+++ b/gnome-flashback.spec
@@ -1,12 +1,11 @@
 Name:           gnome-flashback
-Version:        3.22.1
-Release:        2%{?dist}
+Version:        3.26.0
+Release:        1%{?dist}
 Summary:        Classic GNOME session
 
 License:        GPLv3+
 URL:            https://wiki.gnome.org/Projects/GnomeFlashback
-Source0:        http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz
-Patch0:         gnome-flashback-3.22.1-ibus.patch
+Source0:        http://download.gnome.org/sources/%{name}/3.26/%{name}-%{version}.tar.xz
 
 BuildRequires:  gnome-common
 BuildRequires:  gettext-devel
@@ -14,7 +13,7 @@ BuildRequires:  intltool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.44.0
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.19.5
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22.0
 BuildRequires:  pkgconfig(gnome-bluetooth-1.0)
 BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.12.0
 BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.21.4
@@ -29,18 +28,20 @@ BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11-xcb)
 BuildRequires:  pkgconfig(xcb-randr)
 BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xi) >= 1.6.0
 BuildRequires:  pkgconfig(xkbcommon-x11)
 BuildRequires:  pkgconfig(xkbfile)
 BuildRequires:  pkgconfig(xkeyboard-config)
-BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xrandr) >= 1.5.0
 Requires:       gnome-panel
 Requires:       gnome-applets
-Requires:       metacity
 Requires:       gnome-keyring
 Requires:       gnome-screensaver
 Requires:       gnome-settings-daemon
 Requires:       gnome-session
+Requires:       metacity
+Requires:       nautilus
 Requires:       network-manager-applet
 
 %description
@@ -53,7 +54,6 @@ by integrating recent changes of the GNOME libraries.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -90,14 +90,18 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/desktop-directories/X-GNOME-Flashback-Settings.directory
 %{_datadir}/desktop-directories/X-GNOME-Flashback-Settings-System.directory
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-flashback.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-flashback.*.gschema.xml
 %{_datadir}/gnome-session/sessions/gnome-flashback-compiz.session
 %{_datadir}/gnome-session/sessions/gnome-flashback-metacity.session
 %{_datadir}/xsessions/gnome-flashback-compiz.desktop
 %{_datadir}/xsessions/gnome-flashback-metacity.desktop
 
 %changelog
-* Tue May 30 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.22.1-2
-- Fix FTBFS with ibus-1.5.3
+* Mon Nov 13 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.26.0-1
+- new version
+
+* Tue Mar 28 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.24.0-1
+- new version
 
 * Sun Mar 26 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.22.1-1
 - new version
diff --git a/sources b/sources
index 49bec6f..7973f27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a803c05e35aa779033295bffbb55f6f  gnome-flashback-3.22.1.tar.xz
+5aebc70e2eac114ebcfece4216c01d6e  gnome-flashback-3.26.0.tar.xz