Merge branch 'f27'

This commit is contained in:
Zdenek Dohnal 2017-11-06 13:18:04 +01:00
commit c5990f7d78
2 changed files with 70 additions and 1 deletions

View File

@ -0,0 +1,62 @@
diff -urw hplip-3.17.10-orig/data/models/models.dat hplip-3.17.10/data/models/models.dat
--- hplip-3.17.10-orig/data/models/models.dat 2017-10-13 10:39:44.000000000 +0200
+++ hplip-3.17.10/data/models/models.dat 2017-11-02 21:14:40.931754882 +0100
@@ -57211,6 +57211,58 @@
usb-vid=3f0
wifi-config=3
+[hp_colorlaserjet_mfp_m278-m281]
+align-type=0
+clean-type=0
+color-cal-type=0
+copy-type=0
+embedded-server-type=1
+fax-type=7
+fw-download=False
+icon=hp_color_laserjet_cm1312_mfp.png
+io-mfp-mode=1
+io-mode=1
+io-support=14
+job-storage=0
+linefeed-cal-type=0
+model1=HP Color LaserJet MFP M278-281
+monitor-type=0
+panel-check-type=0
+pcard-type=0
+plugin=1
+plugin-reason=64
+power-settings=0
+ppd-name=hp-color_laserjet_pro_mfp_m277
+pq-diag-type=0
+r-type=0
+r0-agent1-kind=4
+r0-agent1-sku=CF400A/CF400X
+r0-agent1-type=1
+r0-agent2-kind=4
+r0-agent2-sku=CF401A
+r0-agent2-type=4
+r0-agent3-kind=4
+r0-agent3-sku=CF403A
+r0-agent3-type=5
+r0-agent4-kind=4
+r0-agent4-sku=CF402A
+r0-agent4-type=6
+scan-src=3
+scan-type=5
+status-battery-check=0
+status-dynamic-counters=0
+status-type=10
+support-released=True
+support-subtype=48c3
+support-type=2
+support-ver=3.15.4
+tech-class=Postscript
+tech-subclass=Normal
+tech-type=4
+usb-pid=3c2a
+usb-vid=3f0
+wifi-config=3
+
[hp_color_laserjet_m553]
align-type=0
clean-type=0

View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.17.10
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+ and MIT and BSD
Url: https://developers.hp.com/hp-linux-imaging-and-printing
@ -41,6 +41,7 @@ Patch24: hplip-3165-sourceoption.patch
Patch25: hplip-noernie.patch
Patch26: hplip-appdata.patch
Patch27: hplip-check-cups.patch
Patch28: hplip-colorlaserjet-mfp-m278-m281.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: python3-pillow
@ -227,6 +228,9 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
# hp-check shows 'CUPS incompatible or not running' even if CUPS is running (bug #1456467)
%patch27 -p1 -b .check-cups
# Add support for HP ColorLaserjet MFP M278-M281 (bug #1509394)
%patch28 -p1 -b .colorlaserjet-mfp-m278-m281
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@ -509,6 +513,9 @@ update-desktop-database &> /dev/null ||:
%postun libs -p /sbin/ldconfig
%changelog
* Mon Nov 06 2017 Zdenek Dohnal <zdohnal@redhat.com> - 3.17.10-3
- 1509394 - Add support for HP ColorLaserjet MFP M278-M281
* Thu Oct 26 2017 Zdenek Dohnal <zdohnal@redhat.com> - 3.17.10-2
- changing url