upstream merge request #93 - fix constructing file dialog

This commit is contained in:
Zdenek Dohnal 2018-02-15 12:12:20 +01:00
parent 8cb6a26236
commit 4beeaa0a25
2 changed files with 21 additions and 5 deletions

View File

@ -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)

View File

@ -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