rpms/hplip
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f21'

Browse Source
This commit is contained in:
Tim Waugh 2014-12-23 16:07:58 +00:00
commit 371de84d4f
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hplip-dj990c-margin.patch Normal file
View File

@ -0,0 +1,15 @@
diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.dj990c-margin hplip-3.14.10/prnt/drv/hpcups.drv.in
--- hplip-3.14.10/prnt/drv/hpcups.drv.in.dj990c-margin 2014-12-23 15:55:09.779368939 +0000
+++ hplip-3.14.10/prnt/drv/hpcups.drv.in 2014-12-23 15:55:24.488454126 +0000
@@ -1531,9 +1531,9 @@ Manufacturer "HP"
"<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice"
CustomMedia "Letter.Duplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
"<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
- CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36.00 18 9.00 "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
+ CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 36.00 9 9.00 "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
- CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
+ CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
"<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"

9
hplip.spec
View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.14.10
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2+ and MIT
Url: http://hplip.sourceforge.net/
@ -36,6 +36,7 @@ Patch19: hplip-avahi-parsing.patch
Patch20: hplip-reportlab.patch
Patch21: hplip-device_open.patch
Patch22: hplip-jpeg.patch
Patch23: hplip-dj990c-margin.patch
%global hpijs_epoch 1
Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release}
@ -263,6 +264,9 @@ done
# Fixed build against libjpeg-turbo 1.3.90.
%patch22 -p1 -b .jpeg
# Fixed left/right margins for HP DeskJet 990C (LP #1405212).
%patch23 -p1 -b .dj990c-margin
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@ -499,6 +503,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
* Tue Dec 23 2014 Tim Waugh <twaugh@redhat.com> - 3.14.10-5
- Fixed left/right margins for HP DeskJet 990C (LP #1405212).
* Tue Nov 4 2014 Tim Waugh <twaugh@redhat.com> - 3.14.10-4
- IEEE 1284 Device ID for HP LaserJet Professional M1132 MFP
(bug #1158743 comment #5).