Merge branch 'f25' into epel7

Conflicts:
	gnome-flashback.spec
	sources

3 files changed, 65 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d2f1345
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+/gnome-flashback-3.18.0.tar.xz
+/gnome-flashback-3.18.1.tar.xz
+/gnome-flashback-3.18.2.tar.xz
+/gnome-flashback-3.20.0.tar.xz
+/gnome-flashback-3.20.1.tar.xz
+/gnome-flashback-3.20.2.tar.xz
+/gnome-flashback-3.22.0.tar.xz
+/gnome-flashback-3.22.1.tar.xz
diff --git a/gnome-flashback.spec b/gnome-flashback.spec
index afb09d4..6637e36 100644
--- a/gnome-flashback.spec
+++ b/gnome-flashback.spec
@@ -1,42 +1,46 @@
 Name:           gnome-flashback
-Version:        3.14.0
-Release:        7%{?dist}
+Version:        3.22.1
+Release:        1%{?dist}
 Summary:        Classic GNOME session
 
 License:        GPLv3+
 URL:            https://wiki.gnome.org/Projects/GnomeFlashback
-Source0:        http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz
-# taken from polkit-gnome, license is LGPLv2+, requires because of
-# http://lists.fedoraproject.org/pipermail/devel-announce/2011-February/000758.html
-Source1:        polkit-gnome-authentication-agent-1.desktop
-Source2:        gnome-flashback-nm-applet.desktop
-Source3:        gnome-flashback-screensaver.desktop
-Patch1:         0001-workarounds-add-app-menu-and-button-layout-workaroun.patch
+Source0:        http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz
 
 BuildRequires:  gnome-common
 BuildRequires:  gettext-devel
 BuildRequires:  intltool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dbus-glib-1)
-BuildRequires:  pkgconfig(glib-2.0) >= 2.40.0
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.12.0
+BuildRequires:  pkgconfig(glib-2.0) >= 2.44.0
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.19.5
+BuildRequires:  pkgconfig(gnome-bluetooth-1.0)
 BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.12.0
-BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.12.0
+BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.21.4
+BuildRequires:  pkgconfig(ibus-1.0) >= 1.5.2
 BuildRequires:  pkgconfig(libcanberra-gtk3) >= 0.13
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libpulse-mainloop-glib)
+BuildRequires:  pkgconfig(polkit-agent-1) >= 0.97
+BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.97
+BuildRequires:  pkgconfig(upower-glib) >= 0.99.0
 BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(x11-xcb)
+BuildRequires:  pkgconfig(xcb-randr)
 BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xi) >= 1.6.0
+BuildRequires:  pkgconfig(xkbcommon-x11)
+BuildRequires:  pkgconfig(xkbfile)
+BuildRequires:  pkgconfig(xkeyboard-config)
+BuildRequires:  pkgconfig(xrandr)
 Requires:       gnome-panel
 Requires:       gnome-applets
 Requires:       metacity
-Requires:       notification-daemon
 Requires:       gnome-keyring
 Requires:       gnome-screensaver
 Requires:       gnome-settings-daemon
 Requires:       gnome-session
 Requires:       network-manager-applet
-Requires:       polkit-gnome
 
 %description
 GNOME Flashback is a session for GNOME 3 which was initially called
@@ -48,8 +52,6 @@ by integrating recent changes of the GNOME libraries.
 
 %prep
 %setup -q
-%patch1 -p1
-gnome-autogen.sh
 
 
 %build
@@ -82,7 +84,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %files -f %{name}.lang
 %doc COPYING NEWS
 %{_sysconfdir}/xdg/autostart/gnome-flashback-nm-applet.desktop
-%{_sysconfdir}/xdg/autostart/gnome-flashback-polkit-gnome-authentication-agent-1.desktop
 %{_sysconfdir}/xdg/autostart/gnome-flashback-screensaver.desktop
 %{_sysconfdir}/xdg/menus/gnome-flashback-applications.menu
 %{_bindir}/gnome-flashback
@@ -90,6 +91,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libexecdir}/gnome-flashback-metacity
 %{_datadir}/applications/gnome-flashback-init.desktop
 %{_datadir}/applications/gnome-flashback.desktop
+%{_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}/gnome-session/sessions/gnome-flashback-compiz.session
 %{_datadir}/gnome-session/sessions/gnome-flashback-metacity.session
@@ -97,6 +100,42 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/xsessions/gnome-flashback-metacity.desktop
 
 %changelog
+* Sun Mar 26 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.22.1-1
+- new version
+
+* Thu Oct 06 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.22.0-1
+- new version
+
+* Mon Sep 12 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.20.2-1
+- new version
+
+* Wed May 18 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.20.1-1
+- new version
+
+* Thu Apr 14 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.20.0-1
+- new version for GNOME Flashback 3.20.
+
+* Thu Oct 15 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.18.1-1
+- Update to 3.18.1
+
+* Fri Oct 02 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.18.0-1
+- Update for GNOME Flashback 3.18.
+
+* Mon Aug 24 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.17.2-2
+- Fix crash in display-config (BGO#753927)
+
+* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.17.2-1
+- Unstable version bump
+
+* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.16.1-3
+- Add polkit-gnome autostart
+
+* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.16.1-2
+- Add upstream fix for BGO#738562
+
+* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.16.1-1
+- Update for GNOME 3.16.
+
 * Thu Dec 17 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-7
 - Add autostart for gnome-screensaver and nm-applet
 
diff --git a/sources b/sources
index 9658122..49bec6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-057c32f0c3a8772355cca862e2b8658e  gnome-flashback-3.14.0.tar.xz
+6a803c05e35aa779033295bffbb55f6f  gnome-flashback-3.22.1.tar.xz