bad whitespaces (bug #1372343)
This commit is contained in:
commit
d03831610e
18
hplip-badwhitespace.patch
Normal file
18
hplip-badwhitespace.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
diff -up hplip-3.16.8/prnt/filters/hpps.badwhitespace hplip-3.16.8/prnt/filters/hpps
|
||||||
|
--- hplip-3.16.8/prnt/filters/hpps.badwhitespace 2016-09-01 19:15:43.509068772 +0200
|
||||||
|
+++ hplip-3.16.8/prnt/filters/hpps 2016-09-01 19:32:47.861548645 +0200
|
||||||
|
@@ -197,11 +197,11 @@ if 'HPPinPrnt' in options and 'noHPPinPr
|
||||||
|
msg("Setting Pin to default")
|
||||||
|
else:
|
||||||
|
szKeyInitials = ['HPFIDigit', 'HPSEDigit', 'HPTHDigit', 'HPFTDigit']
|
||||||
|
- for x in szKeyInitials:
|
||||||
|
+ for x in szKeyInitials:
|
||||||
|
try:
|
||||||
|
- secpin += opts[x]
|
||||||
|
+ secpin += opts[x]
|
||||||
|
except KeyError:
|
||||||
|
- secpin += '0'
|
||||||
|
+ secpin += '0'
|
||||||
|
|
||||||
|
os.write(output_fd, to_bytes_utf8('@PJL SET HOLDKEY="%s"\x0a' % secpin))
|
||||||
|
|
@ -7,7 +7,7 @@
|
|||||||
Summary: HP Linux Imaging and Printing Project
|
Summary: HP Linux Imaging and Printing Project
|
||||||
Name: hplip
|
Name: hplip
|
||||||
Version: 3.16.8
|
Version: 3.16.8
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPLv2+ and MIT and BSD
|
License: GPLv2+ and MIT and BSD
|
||||||
|
|
||||||
Url: http://hplip.sourceforge.net/
|
Url: http://hplip.sourceforge.net/
|
||||||
@ -38,6 +38,7 @@ Patch22: hplip-no-write-bytecode.patch
|
|||||||
Patch23: hplip-silence-ioerror.patch
|
Patch23: hplip-silence-ioerror.patch
|
||||||
Patch24: hplip-3165-sourceoption.patch
|
Patch24: hplip-3165-sourceoption.patch
|
||||||
Patch25: hplip-include-ppdh.patch
|
Patch25: hplip-include-ppdh.patch
|
||||||
|
Patch26: hplip-badwhitespace.patch
|
||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
Requires: python3-pillow
|
Requires: python3-pillow
|
||||||
@ -215,6 +216,9 @@ done
|
|||||||
# FTBFS error when rebasing to 3.16.5 - need to include ppd.h
|
# FTBFS error when rebasing to 3.16.5 - need to include ppd.h
|
||||||
%patch25 -p1 -b .include-ppdh
|
%patch25 -p1 -b .include-ppdh
|
||||||
|
|
||||||
|
# Bad whitespaces (bug #1372343)
|
||||||
|
%patch26 -p1 -b .badwhitespace
|
||||||
|
|
||||||
sed -i.duplex-constraints \
|
sed -i.duplex-constraints \
|
||||||
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
|
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
|
||||||
prnt/drv/hpcups.drv.in
|
prnt/drv/hpcups.drv.in
|
||||||
@ -466,6 +470,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
|||||||
%postun libs -p /sbin/ldconfig
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 01 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.8-2
|
||||||
|
- bad whitespaces (bug #1372343)
|
||||||
|
|
||||||
* Tue Aug 30 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.8-1
|
* Tue Aug 30 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.8-1
|
||||||
- rebase to 3.16.8
|
- rebase to 3.16.8
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user