From 4beeaa0a25ba876d59e48b1a531a4c9366c78d03 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Thu, 15 Feb 2018 12:12:20 +0100
Subject: [PATCH] upstream merge request #93 - fix constructing file dialog

---
 system-config-printer-authdialog.patch | 15 +++++++++++++++
 system-config-printer.spec             | 11 ++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 system-config-printer-authdialog.patch

diff --git a/system-config-printer-authdialog.patch b/system-config-printer-authdialog.patch
new file mode 100644
index 0000000..9be4427
--- /dev/null
+++ b/system-config-printer-authdialog.patch
@@ -0,0 +1,15 @@
+diff -up system-config-printer-1.5.11/authconn.py.authdialog system-config-printer-1.5.11/authconn.py
+--- system-config-printer-1.5.11/authconn.py.authdialog	2018-02-15 11:42:35.074157581 +0100
++++ system-config-printer-1.5.11/authconn.py	2018-02-15 11:43:51.652437359 +0100
+@@ -78,11 +78,9 @@ class AuthDialog(Gtk.Dialog):
+             field = auth_info_required[i]
+             label = Gtk.Label (label=_(self.AUTH_FIELD.get (field, field)))
+             label.set_alignment (0, 0.5)
+-            grid.attach (label, 0, 1, i, i + 1)
+             grid.attach (label, 0, i, 1, 1)
+             entry = Gtk.Entry ()
+             entry.set_visibility (field != 'password')
+-            grid.attach (entry, 1, 2, i, i + 1, 0, 0)
+             grid.attach (entry, 1, i, 1, 1)
+             self.field_entry.append (entry)
+ 
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 49f9a17..cd3e891 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -9,13 +9,12 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.5.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: https://github.com/%{username}/%{name}
 Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 
-#Patch01: system-config-printer-1.5.9-bz1419175.patch
-#Patch02: system-config-printer-1.5.9-keyring-workaround.patch
+Patch01: system-config-printer-authdialog.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
@@ -83,8 +82,7 @@ printers.
 
 %prep
 %setup -q
-#%%patch01 -p1 -b .bz1419175
-#%%patch02 -p1 -b .keyring-workaround
+%patch01 -p1 -b .authdialog
 
 %build
 aclocal
@@ -190,6 +188,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 exit 0
 
 %changelog
+* Thu Feb 15 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.11-6
+- upstream merge request #93 - fix constructing file dialog
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.5.11-5
 - Escape macros in %%changelog