rpms/gutenprint
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f17' into f18

Browse Source
This commit is contained in:
Jiri Popelka 2013-01-17 12:32:43 +01:00
commit 2d6025f175
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gutenprint-device-ids.patch
View File

@ -1,6 +1,6 @@
diff -up gutenprint-5.2.9/src/xml/printers.xml.device-ids gutenprint-5.2.9/src/xml/printers.xml
--- gutenprint-5.2.9/src/xml/printers.xml.device-ids 2012-05-31 01:57:53.000000000 +0100
+++ gutenprint-5.2.9/src/xml/printers.xml 2012-10-19 15:17:00.841235812 +0100
--- gutenprint-5.2.9/src/xml/printers.xml.device-ids 2012-05-31 02:57:53.000000000 +0200
+++ gutenprint-5.2.9/src/xml/printers.xml 2013-01-17 12:12:42.448745262 +0100
@@ -149,16 +149,16 @@
<printer translate="name" name="Canon PIXMA iP100" driver="bjc-PIXMA-iP100" manufacturer="Canon" model="3000100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP100" />
<printer translate="name" name="Canon PIXMA iP2000" driver="bjc-PIXMA-iP2000" manufacturer="Canon" model="3002000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP2000" />
@ -151,6 +151,15 @@ diff -up gutenprint-5.2.9/src/xml/printers.xml.device-ids gutenprint-5.2.9/src/x
<printer translate="name" name="HP Mopier 240" driver="hp-mopier_240" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-Mopier_240" />
<printer translate="name" name="HP Mopier 320" driver="hp-mopier_320" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-Mopier_320" />
<printer translate="name" name="HP OfficeJet 300" deviceid="MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;CMD:MLC,PCL,PML;" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" foomaticid="HP-OfficeJet_300" />
@@ -1384,7 +1386,7 @@
<printer translate="name" name="Kyocera FS-1020D" driver="kyocera-fs-1020d" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1020D" />
<printer translate="name" name="Kyocera FS-1030D" driver="kyocera-fs-1030d" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1030D" />
<printer translate="name" name="Kyocera FS-1050" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1050;DES:Kyocera FS-1050;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1050" />
- <printer translate="name" name="Kyocera FS-1118MFP" driver="kyocera-fs-1118mfp" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1118MFP" />
+ <printer translate="name" name="Kyocera FS-1118MFP" deviceid="MFG:Kyocera;MDL:FS-1118MFP;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;" driver="kyocera-fs-1118mfp" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1118MFP" />
<printer translate="name" name="Kyocera FS-1200" deviceid="MFG:Kyocera;MDL:Kyocera FS-1200;DES:Kyocera FS-1200;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1200" />
<printer translate="name" name="Kyocera FS-1600" deviceid="MFG:Kyocera;MDL:FS-1600;DES:Kyocera FS-1600;" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1600" />
<printer translate="name" name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1600plus" />
@@ -1652,7 +1654,7 @@
<printer translate="name" name="Ricoh Aficio MP 9000" driver="ricoh-afc_mp_9000" manufacturer="Ricoh" model="61" parameters="pcl_laser_params" foomaticid="Ricoh-Aficio_MP_9000" />
<printer translate="name" name="Samsung ML-85" driver="samsung-ml-85" manufacturer="Samsung" model="6" parameters="pcl_laser_params" foomaticid="Samsung-ML-85" />
@ -160,3 +169,4 @@ diff -up gutenprint-5.2.9/src/xml/printers.xml.device-ids gutenprint-5.2.9/src/x
<printer translate="name" name="Samsung ML-1450PS" driver="samsung-ml-1450ps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" foomaticid="Samsung-ML-1450PS" />
<printer translate="name" name="Samsung ML-1650" deviceid="MFG:Samsung;MDL:ML-1650;CMD:PCL5E,PCL6;" driver="samsung-ml-1650" manufacturer="Samsung" model="6" parameters="pcl_laser_params" foomaticid="Samsung-ML-1650" />
<printer translate="name" name="Samsung ML-1651N" driver="samsung-ml-1651n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" foomaticid="Samsung-ML-1651N" />

6
gutenprint.spec
View File

@ -3,7 +3,7 @@
Name: gutenprint
Summary: Printer Drivers Package
Version: 5.2.9
Release: 7%{?dist}
Release: 8%{?dist}
Group: System Environment/Base
URL: http://gimp-print.sourceforge.net/
Source0: http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2
@ -173,6 +173,7 @@ Epson, HP and compatible printers.
# Brother hl-2035 (bug #651603#c3)
# Canon PIXMA MP250 (bug #744087).
# Canon PIXMA Pro9000mk2.
# Kyocera FS-1118MFP (bug #782379).
%patch4 -p1 -b .device-ids
# Fix build against new versions of gcc.
@ -300,6 +301,9 @@ fi
/bin/rm -f /var/cache/foomatic/*
%changelog
* Thu Jan 17 2013 Jiri Popelka <jpopelka@redhat.com> 5.2.9-2
- Added IEEE 1284 Device ID for Kyocera FS-1118MFP (bug #782379).
* Tue Dec 18 2012 Tim Waugh <twaugh@redhat.com> 5.2.9-7
- Don't export yy* symbols (bug #882194).