From e4d8e5bcfe5c782d0ed5b5775b50c81e925dcca9 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: May 05 2017 18:33:14 +0000 Subject: Update to 1.0.3 release --- diff --git a/lightdm-settings-1.0.2-HiDPI_support.patch b/lightdm-settings-1.0.2-HiDPI_support.patch deleted file mode 100644 index 1a6a322..0000000 --- a/lightdm-settings-1.0.2-HiDPI_support.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b4ffcdbdd70fd4da65d32c1a8997830938e0f080 Mon Sep 17 00:00:00 2001 -From: Clement Lefebvre -Date: Fri, 7 Apr 2017 18:45:05 +0100 -Subject: [PATCH] Add support for HiDPI - ---- - usr/lib/lightdm-settings/lightdm-settings | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/usr/lib/lightdm-settings/lightdm-settings b/usr/lib/lightdm-settings/lightdm-settings -index 526dc19..8f492b8 100755 ---- a/usr/lib/lightdm-settings/lightdm-settings -+++ b/usr/lib/lightdm-settings/lightdm-settings -@@ -96,6 +96,8 @@ class Application(Gtk.Application): - row = section.add_row(SettingsRow(Gtk.Label(_("GTK theme")), SettingsCombo(keyfile, settings, "theme-name", self.get_gtk_themes(), "string"))) - row = section.add_row(SettingsRow(Gtk.Label(_("Icon theme")), SettingsCombo(keyfile, settings, "icon-theme-name", self.get_icon_themes(), "string"))) - -+ section.add_row(SettingsRow(Gtk.Label(_("Enable HiDPI support")), SettingsSwitch(keyfile, settings, "enable-hidpi"))) -+ - self.window.add(self.main_box) - - self.main_stack.add_titled(page, "settings", _("Settings")) diff --git a/lightdm-settings-1.0.2-dont_show_toolbar.patch b/lightdm-settings-1.0.2-dont_show_toolbar.patch deleted file mode 100644 index c14677b..0000000 --- a/lightdm-settings-1.0.2-dont_show_toolbar.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 558833d57f9fd4119500af7d543c863cc37f7380 Mon Sep 17 00:00:00 2001 -From: Clement Lefebvre -Date: Sat, 8 Apr 2017 14:19:22 +0100 -Subject: [PATCH] Don't show a toolbar for now - -We only have one stack at the moment. ---- - usr/lib/lightdm-settings/lightdm-settings | 31 +++++++++++++++---------------- - 1 file changed, 15 insertions(+), 16 deletions(-) - -diff --git a/usr/lib/lightdm-settings/lightdm-settings b/usr/lib/lightdm-settings/lightdm-settings -index 0869ff8..2c3c03b 100755 ---- a/usr/lib/lightdm-settings/lightdm-settings -+++ b/usr/lib/lightdm-settings/lightdm-settings -@@ -42,28 +42,27 @@ class Application(Gtk.Application): - self.main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) - - # Toolbar -- toolbar = Gtk.Toolbar() -- toolbar.get_style_context().add_class("primary-toolbar") -- self.main_box.pack_start(toolbar, False, False, 0) -+ # toolbar = Gtk.Toolbar() -+ # toolbar.get_style_context().add_class("primary-toolbar") -+ # self.main_box.pack_start(toolbar, False, False, 0) - - self.main_stack = Gtk.Stack() - self.main_stack.set_transition_type(Gtk.StackTransitionType.SLIDE_LEFT_RIGHT) - self.main_stack.set_transition_duration(150) - self.main_box.pack_start(self.main_stack, True, True, 0) - -- stack_switcher = Gtk.StackSwitcher() -- stack_switcher.set_stack(self.main_stack) -- -- tool_item = Gtk.ToolItem() -- tool_item.set_expand(True) -- tool_item.get_style_context().add_class("raised") -- toolbar.insert(tool_item, 0) -- switch_holder = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) -- switch_holder.set_border_width(1) -- tool_item.add(switch_holder) -- # switch_holder.pack_start(stack_switcher, True, True, 0) -- stack_switcher.set_halign(Gtk.Align.CENTER) -- toolbar.show_all() -+ # stack_switcher = Gtk.StackSwitcher() -+ # stack_switcher.set_stack(self.main_stack) -+ # tool_item = Gtk.ToolItem() -+ # tool_item.set_expand(True) -+ # tool_item.get_style_context().add_class("raised") -+ # toolbar.insert(tool_item, 0) -+ # switch_holder = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) -+ # switch_holder.set_border_width(1) -+ # tool_item.add(switch_holder) -+ # # switch_holder.pack_start(stack_switcher, True, True, 0) -+ # stack_switcher.set_halign(Gtk.Align.CENTER) -+ # toolbar.show_all() - - settings = Gio.Settings("x.dm.slick-greeter") - diff --git a/lightdm-settings-1.0.2-force_HiDPI-on_off.patch b/lightdm-settings-1.0.2-force_HiDPI-on_off.patch deleted file mode 100644 index 551109c..0000000 --- a/lightdm-settings-1.0.2-force_HiDPI-on_off.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 6c64af74ef5f9c55996791b2f45e6bab9b383e0a Mon Sep 17 00:00:00 2001 -From: Clement Lefebvre -Date: Sat, 8 Apr 2017 14:12:52 +0100 -Subject: [PATCH] HiDPI: Allow to force HiDPI on or off - ---- - lightdm-settings.pot | 20 ++++++++++++++++---- - usr/lib/lightdm-settings/lightdm-settings | 6 +++++- - 2 files changed, 21 insertions(+), 5 deletions(-) - -diff --git a/lightdm-settings.pot b/lightdm-settings.pot -index 554c80b..be61037 100644 ---- a/lightdm-settings.pot -+++ b/lightdm-settings.pot -@@ -8,7 +8,7 @@ msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2017-04-07 18:45+0100\n" -+"POT-Creation-Date: 2017-04-08 14:12+0100\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -22,7 +22,7 @@ msgid "Login Window" - msgstr "" - - #: usr/lib/lightdm-settings/lightdm-settings:84 --#: usr/lib/lightdm-settings/lightdm-settings:103 -+#: usr/lib/lightdm-settings/lightdm-settings:107 - msgid "Settings" - msgstr "" - -@@ -62,8 +62,20 @@ msgstr "" - msgid "Icon theme" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:99 --msgid "Enable HiDPI support" -+#: usr/lib/lightdm-settings/lightdm-settings:100 -+msgid "Auto" -+msgstr "" -+ -+#: usr/lib/lightdm-settings/lightdm-settings:101 -+msgid "Enable" -+msgstr "" -+ -+#: usr/lib/lightdm-settings/lightdm-settings:102 -+msgid "Disable" -+msgstr "" -+ -+#: usr/lib/lightdm-settings/lightdm-settings:103 -+msgid "HiDPI support" - msgstr "" - - #: generate_desktop_files:27 -diff --git a/usr/lib/lightdm-settings/lightdm-settings b/usr/lib/lightdm-settings/lightdm-settings -index 8f492b8..0869ff8 100755 ---- a/usr/lib/lightdm-settings/lightdm-settings -+++ b/usr/lib/lightdm-settings/lightdm-settings -@@ -96,7 +96,11 @@ class Application(Gtk.Application): - row = section.add_row(SettingsRow(Gtk.Label(_("GTK theme")), SettingsCombo(keyfile, settings, "theme-name", self.get_gtk_themes(), "string"))) - row = section.add_row(SettingsRow(Gtk.Label(_("Icon theme")), SettingsCombo(keyfile, settings, "icon-theme-name", self.get_icon_themes(), "string"))) - -- section.add_row(SettingsRow(Gtk.Label(_("Enable HiDPI support")), SettingsSwitch(keyfile, settings, "enable-hidpi"))) -+ hidpi_options = [] -+ hidpi_options.append(["auto", _("Auto")]) -+ hidpi_options.append(["on", _("Enable")]) -+ hidpi_options.append(["off", _("Disable")]) -+ section.add_row(SettingsRow(Gtk.Label(_("HiDPI support")), SettingsCombo(keyfile, settings, "enable-hidpi", hidpi_options, "string"))) - - self.window.add(self.main_box) - diff --git a/lightdm-settings-1.0.2-pot_file.patch b/lightdm-settings-1.0.2-pot_file.patch deleted file mode 100644 index 62c69e5..0000000 --- a/lightdm-settings-1.0.2-pot_file.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 3c4d3a35847cd762402c70f56ddaa28d5e2127d0 Mon Sep 17 00:00:00 2001 -From: Clement Lefebvre -Date: Fri, 7 Apr 2017 18:45:27 +0100 -Subject: [PATCH] l10n: Update POT file - ---- - lightdm-settings.pot | 30 +++++++++++++++++------------- - 1 file changed, 17 insertions(+), 13 deletions(-) - -diff --git a/lightdm-settings.pot b/lightdm-settings.pot -index 3cbb2f8..554c80b 100644 ---- a/lightdm-settings.pot -+++ b/lightdm-settings.pot -@@ -8,7 +8,7 @@ msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2017-03-21 16:04+0000\n" -+"POT-Creation-Date: 2017-04-07 18:45+0100\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -17,51 +17,55 @@ msgstr "" - "Content-Type: text/plain; charset=CHARSET\n" - "Content-Transfer-Encoding: 8bit\n" - --#: usr/lib/lightdm-settings/lightdm-settings:37 generate_desktop_files:27 -+#: usr/lib/lightdm-settings/lightdm-settings:38 generate_desktop_files:27 - msgid "Login Window" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:77 --#: usr/lib/lightdm-settings/lightdm-settings:95 -+#: usr/lib/lightdm-settings/lightdm-settings:84 -+#: usr/lib/lightdm-settings/lightdm-settings:103 - msgid "Settings" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:79 -+#: usr/lib/lightdm-settings/lightdm-settings:86 - msgid "Draw a grid" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:80 -+#: usr/lib/lightdm-settings/lightdm-settings:87 - msgid "Draw user backgrounds" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:81 -+#: usr/lib/lightdm-settings/lightdm-settings:88 - msgid "Show hostname" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:83 -+#: usr/lib/lightdm-settings/lightdm-settings:90 - msgid "Logo" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:85 -+#: usr/lib/lightdm-settings/lightdm-settings:91 - msgid "Background logo" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:86 -+#: usr/lib/lightdm-settings/lightdm-settings:92 - msgid "Background" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:88 -+#: usr/lib/lightdm-settings/lightdm-settings:94 - msgid "Background color" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:90 -+#: usr/lib/lightdm-settings/lightdm-settings:96 - msgid "GTK theme" - msgstr "" - --#: usr/lib/lightdm-settings/lightdm-settings:91 -+#: usr/lib/lightdm-settings/lightdm-settings:97 - msgid "Icon theme" - msgstr "" - -+#: usr/lib/lightdm-settings/lightdm-settings:99 -+msgid "Enable HiDPI support" -+msgstr "" -+ - #: generate_desktop_files:27 - msgid "Configure the login window" - msgstr "" diff --git a/lightdm-settings-1.0.2-user_bg_ubuntu_only.patch b/lightdm-settings-1.0.2-user_bg_ubuntu_only.patch deleted file mode 100644 index 790475a..0000000 --- a/lightdm-settings-1.0.2-user_bg_ubuntu_only.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 2f4e9c4ed6e4263652f98361687d09e67cff1e52 Mon Sep 17 00:00:00 2001 -From: Clement Lefebvre -Date: Sat, 8 Apr 2017 14:29:48 +0100 -Subject: [PATCH] Only support user backgrounds in Ubuntu derivatives - -Backgrounds aren't part of AccountsService, that support is patched -by Ubuntu and only exists in its derivatives. ---- - debian/control | 2 +- - usr/lib/lightdm-settings/lightdm-settings | 15 ++++++++++++++- - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/debian/control b/debian/control -index 0f8f175..565b4ee 100644 ---- a/debian/control -+++ b/debian/control -@@ -7,7 +7,7 @@ Standards-Version: 3.9.5 - - Package: lightdm-settings - Architecture: all --Depends: ${misc:Depends}, python3-setproctitle -+Depends: ${misc:Depends}, python3-setproctitle, lsb-release - Description: LightDM configuration tool - A configuration tool for the LightDM display manager. - -diff --git a/usr/lib/lightdm-settings/lightdm-settings b/usr/lib/lightdm-settings/lightdm-settings -index 2c3c03b..e4d18b5 100755 ---- a/usr/lib/lightdm-settings/lightdm-settings -+++ b/usr/lib/lightdm-settings/lightdm-settings -@@ -11,6 +11,11 @@ from SettingsWidgets import * - gi.require_version('Gtk', '3.0') - from gi.repository import Gtk, Gio, GLib - -+try: -+ import lsb_release -+except: -+ pass -+ - setproctitle.setproctitle("lightdm-settings") - - gettext.install("lightdm-settings", "/usr/share/locale") -@@ -83,7 +88,15 @@ class Application(Gtk.Application): - section = page.add_section(_("Settings")) - - section.add_row(SettingsRow(Gtk.Label(_("Draw a grid")), SettingsSwitch(keyfile, settings, "draw-grid"))) -- section.add_row(SettingsRow(Gtk.Label(_("Draw user backgrounds")), SettingsSwitch(keyfile, settings, "draw-user-backgrounds"))) -+ -+ try: -+ distro = lsb_release.get_lsb_information()['ID'] -+ if distro.lower() in ['linuxmint', 'ubuntu', 'elementary']: -+ # AccountsService doesn't support Background selection. It's something that is patched in Ubuntu, so only support this feature -+ # in Ubuntu derivatives -+ section.add_row(SettingsRow(Gtk.Label(_("Draw user backgrounds")), SettingsSwitch(keyfile, settings, "draw-user-backgrounds"))) -+ except: -+ pass - section.add_row(SettingsRow(Gtk.Label(_("Show hostname")), SettingsSwitch(keyfile, settings, "show-hostname"))) - - row = section.add_row(SettingsRow(Gtk.Label(_("Logo")), SettingsFileChooser(keyfile, settings, "logo"))) diff --git a/lightdm-settings-1.0.3-fix_policy_name.patch b/lightdm-settings-1.0.3-fix_policy_name.patch new file mode 100644 index 0000000..f809124 --- /dev/null +++ b/lightdm-settings-1.0.3-fix_policy_name.patch @@ -0,0 +1,26 @@ +From a2b052da9bed4e24e295784b22f77dcc69c96e8f Mon Sep 17 00:00:00 2001 +From: leigh123linux +Date: Fri, 5 May 2017 18:49:03 +0100 +Subject: [PATCH] fix policy name spelling mistake + +--- + .../{org.x.ligthdm-settings.policy => org.x.lightdm-settings.policy} | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + rename usr/share/polkit-1/actions/{org.x.ligthdm-settings.policy => org.x.lightdm-settings.policy} (95%) + +diff --git a/usr/share/polkit-1/actions/org.x.ligthdm-settings.policy b/usr/share/polkit-1/actions/org.x.lightdm-settings.policy +similarity index 95% +rename from usr/share/polkit-1/actions/org.x.ligthdm-settings.policy +rename to usr/share/polkit-1/actions/org.x.lightdm-settings.policy +index 89cc37b..8bbd16a 100644 +--- a/usr/share/polkit-1/actions/org.x.ligthdm-settings.policy ++++ b/usr/share/polkit-1/actions/org.x.lightdm-settings.policy +@@ -7,7 +7,7 @@ + Linux Mint + https://linuxmint.com/ + +- ++ + A configuration tool for LightDM + Please enter your password to configure the slick greeter + preferences-system-login diff --git a/lightdm-settings.spec b/lightdm-settings.spec index baf02db..fdcc50c 100644 --- a/lightdm-settings.spec +++ b/lightdm-settings.spec @@ -1,18 +1,13 @@ Name: lightdm-settings -Version: 1.0.2 -Release: 4%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: Configuration tool for the LightDM display manager License: GPLv3+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz - +Patch0: %{url}/pull/5.patch#/%{name}-%{version}-fix_policy_name.patch # Patches from upstream. -Patch0: %{url}/commit/b4ffcdbdd70fd4da65d32c1a8997830938e0f080.patch#/%{name}-1.0.2-HiDPI_support.patch -Patch1: %{url}/commit/3c4d3a35847cd762402c70f56ddaa28d5e2127d0.patch#/%{name}-1.0.2-pot_file.patch -Patch2: %{url}/commit/6c64af74ef5f9c55996791b2f45e6bab9b383e0a.patch#/%{name}-1.0.2-force_HiDPI-on_off.patch -Patch3: %{url}/commit/558833d57f9fd4119500af7d543c863cc37f7380.patch#/%{name}-1.0.2-dont_show_toolbar.patch -Patch4: %{url}/commit/2f4e9c4ed6e4263652f98361687d09e67cff1e52.patch#/%{name}-1.0.2-user_bg_ubuntu_only.patch BuildArch: noarch @@ -22,6 +17,7 @@ BuildRequires: gettext Requires: filesystem Requires: hicolor-icon-theme Requires: polkit +Requires: python3-xapp Requires: python3-gobject Requires: python3-setproctitle Requires: slick-greeter @@ -40,41 +36,6 @@ for f in .%{_prefix}/lib/%{name}/*.py ; do %{__mv} -f ${f}.new ${f} done -# We use pkexec instead of gksu and /bin/sh instead of /bin/bash. -f=.%{_bindir}/%{name} -%{__sed} -e 's~#![ \t]*/bin/bash~#!/bin/sh~g' \ - -e 's!gksu!%{_bindir}/pkexec!g' < ${f} > ${f}.new -/bin/touch -r ${f} ${f}.new -%{__mv} -f ${f}.new ${f} - -# Create polkit policy configuration for lightdm-settings. -%{__cat} << EOF > org.freedesktop.policykit.exec.%{name}.policy - - - - - Fedora - http://fedoraproject.org/ - - - Run %{name} with elevated privileges - Authentication is required to run %{name} as root - %{name} - - no - no - auth_admin_keep - - %{_prefix}/lib/%{name}/%{name} - true - - - -EOF - - %build %make_build @@ -83,10 +44,6 @@ EOF # No install-target in Makefile. %{__cp} -prv .%{_prefix} %{buildroot} -# Install polkit policy configuration for lightdm-settings. -%{__install} -Dpm 0644 org.freedesktop.policykit.exec.%{name}.policy \ - %{buildroot}%{_datadir}/polkit-1/actions/org.freedesktop.policykit.exec.%{name}.policy - # Set exec-permissions where needed. %{__chmod} -c 0755 %{buildroot}%{_bindir}/%{name} \ %{buildroot}%{_prefix}/lib/%{name}/%{name} @@ -125,10 +82,14 @@ fi %{_prefix}/lib/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* -%{_datadir}/polkit-1/actions/org.freedesktop.policykit.exec.%{name}.policy +%{_datadir}/polkit-1/actions/org.x.%{name}.policy %changelog +* Fri May 05 2017 Leigh Scott - 1.0.3-1 +- Update to 1.0.3 release +- Add requires python3-xapp + * Wed Apr 26 2017 Björn Esser - 1.0.2-4 - Add missing dependency on python3-setproctitle (rhbz#1444436) diff --git a/sources b/sources index aeb2b31..7c7b9b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lightdm-settings-1.0.2.tar.gz) = f44c28caeba50411fcdbee22984c9a1e2526ad8b5cd934b9fcb9dd3e6f65efd8d1b31d517d4bd0f0689d0736823e6299b1b2a3f15d7527007972085617582992 +SHA512 (lightdm-settings-1.0.3.tar.gz) = 2d83b6b1dbfa3835559b084ce167fdfc5a4edd0119ace6bdaa3c0dcaa16e8699b51a01e34dce8ab4c94fd53bd72b11f59df321ca8221e678b69edcff283f1bd8