gnome-flashback 3.18.0

5 files changed, 23 insertions, 123 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6f37f2a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/gnome-flashback-3.18.0.tar.xz
diff --git a/0002-display-config-ignore-outputs-modes.patch b/0002-display-config-ignore-outputs-modes.patch
deleted file mode 100644
index 25a4df9..0000000
--- a/0002-display-config-ignore-outputs-modes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c375d0f042dd16babf6c930a626e1a69f58f3d85 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
-Date: Sun, 23 Aug 2015 13:59:36 +0300
-Subject: display-config: ignore outputs that has no modes
-
-https://bugzilla.gnome.org/show_bug.cgi?id=753927
-
-diff --git a/gnome-flashback/libdisplay-config/flashback-monitor-manager.c b/gnome-flashback/libdisplay-config/flashback-monitor-manager.c
-index 55470ce..29f80ef 100644
---- a/gnome-flashback/libdisplay-config/flashback-monitor-manager.c
-+++ b/gnome-flashback/libdisplay-config/flashback-monitor-manager.c
-@@ -1258,7 +1258,7 @@ read_current_config (FlashbackMonitorManager *manager)
- 
-       meta_output = &manager->outputs[n_actual_outputs];
- 
--      if (output->connection != RR_Disconnected)
-+      if (output->connection != RR_Disconnected && output->nmode != 0)
-         {
-           GBytes *edid;
- 
--- 
-cgit v0.10.2
-
diff --git a/gnome-flashback.spec b/gnome-flashback.spec
index 843111f..c7f6595 100644
--- a/gnome-flashback.spec
+++ b/gnome-flashback.spec
@@ -1,15 +1,11 @@
 Name:           gnome-flashback
-Version:        3.17.2
-Release:        2%{?dist}
+Version:        3.18.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.17/%{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
-Patch2:         0002-display-config-ignore-outputs-modes.patch
+Source0:        http://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz
 
 BuildRequires:  gnome-common
 BuildRequires:  gettext-devel
@@ -18,14 +14,24 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.44.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.15.2
+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(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(xkbcommon-x11)
+BuildRequires:  pkgconfig(xkbfile)
+BuildRequires:  pkgconfig(xkeyboard-config)
+BuildRequires:  pkgconfig(xrandr)
 Requires:       gnome-panel
 Requires:       gnome-applets
 Requires:       metacity
@@ -34,7 +40,7 @@ Requires:       gnome-keyring
 Requires:       gnome-screensaver
 Requires:       gnome-settings-daemon
 Requires:       gnome-session
-Requires:       polkit-gnome
+Requires:       network-manager-applet
 
 %description
 GNOME Flashback is a session for GNOME 3 which was initially called
@@ -46,7 +52,6 @@ by integrating recent changes of the GNOME libraries.
 
 %prep
 %setup -q
-%patch2 -p1
 
 
 %build
@@ -56,10 +61,6 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-# install autostart file for polkit-gnome-authentication-agent-1
-# cannot use desktop-file-install due to OnlyShowIn=GNOME-Flashback
-install -D -m 0644 %{SOURCE1} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/%{name}-polkit-gnome-authentication-agent-1.desktop
 
 %find_lang %{name}
 
@@ -76,13 +77,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
 %doc COPYING NEWS
-%{_sysconfdir}/xdg/autostart/gnome-flashback-polkit-gnome-authentication-agent-1.desktop
+%{_sysconfdir}/xdg/autostart/gnome-flashback-nm-applet.desktop
+%{_sysconfdir}/xdg/autostart/gnome-flashback-screensaver.desktop
 %{_sysconfdir}/xdg/menus/gnome-flashback-applications.menu
 %{_bindir}/gnome-flashback
 %{_libexecdir}/gnome-flashback-compiz
 %{_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
@@ -90,6 +94,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/xsessions/gnome-flashback-metacity.desktop
 
 %changelog
+* 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)
 
diff --git a/polkit-gnome-authentication-agent-1.desktop b/polkit-gnome-authentication-agent-1.desktop
deleted file mode 100644
index 00140c8..0000000
--- a/polkit-gnome-authentication-agent-1.desktop
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[Desktop Entry]
-Name=PolicyKit Authentication Agent
-Name[ar]=مدير الاستيثاق PolicyKit
-Name[be]=PolicyKit - аґент аўтэнтыфікацыі
-Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
-Name[ca]=Agent d'autenticació del PolicyKit
-Name[cs]=Ověřovací agent PolicyKit
-Name[da]=Godkendelsesprogrammet PolicyKit
-Name[de]=Legitimationsdienst von PolicyKit
-Name[el]=Πράκτορας πιστοποίησης PolicyKit
-Name[en_GB]=PolicyKit Authentication Agent
-Name[es]=Agente de autenticación de PolicyKit
-Name[eu]=PolicyKit autentifikatzeko agentea
-Name[fi]=PolicytKit-tunnistautumisohjelma
-Name[fr]=Agent d'authentification de PolicyKit
-Name[gl]=Axente de autenticación PolicyKit
-Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
-Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
-Name[hu]=PolicyKit hitelesítési ügynök
-Name[it]=Agente di autenticazione per PolicyKit
-Name[ja]=PolicyKit 認証エージェント
-Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
-Name[lt]=PolicyKit tapatybės nustatymo agentas
-Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
-Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट
-Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
-Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
-Name[pl]=Agent uwierzytelniania PolicyKit
-Name[pt]=Agente de Autenticação PolicyKit
-Name[pt_BR]=Agente de autenticação PolicyKit
-Name[sl]=PolicyKit program overjanja
-Name[sv]=Autentiseringsagent för PolicyKit
-Name[ta]=PolicyKit அங்கீகார முகவர்
-Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
-Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
-Name[uk]=Агент автентифікації PolicyKit
-Name[zh_CN]=PolicyKit 认证代理
-Name[zh_HK]=PolicyKit 驗證代理程式
-Name[zh_TW]=PolicyKit 驗證代理程式
-Comment=PolicyKit Authentication Agent
-Comment[ar]=مدير الاستيثاق PolicyKit
-Comment[be]=PolicyKit - аґент аўтэнтыфікацыі
-Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
-Comment[ca]=Agent d'autenticació del PolicyKit
-Comment[cs]=Ověřovací agent PolicyKit
-Comment[da]=Godkendelsesprogrammet PolicyKit
-Comment[de]=Legitimationsdienst von PolicyKit
-Comment[el]=Πράκτορας πιστοποίησης PolicyKit
-Comment[en_GB]=PolicyKit Authentication Agent
-Comment[es]=Agente de autenticación de PolicyKit
-Comment[eu]=PolicyKit autentifikatzeko agentea
-Comment[fi]=PolicytKit-tunnistautumisohjelma
-Comment[fr]=Agent d'authentification de PolicyKit
-Comment[gl]=Axente de autenticación PolicyKit
-Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
-Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
-Comment[hu]=PolicyKit hitelesítési ügynök
-Comment[it]=Agente di autenticazione per PolicyKit
-Comment[ja]=PolicyKit 認証エージェント
-Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
-Comment[lt]=PolicyKit tapatybės nustatymo agentas
-Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
-Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट
-Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
-Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
-Comment[pl]=Agent uwierzytelniania PolicyKit
-Comment[pt]=Agente de Autenticação PolicyKit
-Comment[pt_BR]=Agente de autenticação PolicyKit
-Comment[sl]=PolicyKit program overjanja
-Comment[sv]=Autentiseringsagent för PolicyKit
-Comment[ta]=PolicyKit அங்கீகார முகவர்
-Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
-Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
-Comment[uk]=Агент автентифікації PolicyKit
-Comment[zh_CN]=PolicyKit 认证代理
-Comment[zh_HK]=PolicyKit 驗證代理程式
-Comment[zh_TW]=PolicyKit 驗證代理程式
-Exec=/usr/libexec/polkit-gnome-authentication-agent-1
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-X-Desktop-File-Install-Version=0.16
-OnlyShowIn=GNOME-Flashback;
diff --git a/sources b/sources
index 69d4b12..5f959f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d8638e3cc6a5596d345f7887a355144  gnome-flashback-3.17.2.tar.xz
+5e519018810712a76630da9b2f3434d3  gnome-flashback-3.18.0.tar.xz