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

Merge branch 'f17' into f18

This commit is contained in:
Jiri Popelka 2013-03-06 12:56:42 +01:00
parent 868abc1a63 f7e3012d86
commit 5bd0761a89
2 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
splix-deviceID.patch
View File

@ -1,6 +1,6 @@
diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
--- splix/ppd/samsung.drv.in.deviceID 2011-12-06 22:55:59.000000000 +0100
+++ splix/ppd/samsung.drv.in 2012-10-17 16:04:15.091955225 +0200
--- splix/ppd/samsung.drv.in.deviceID 2012-07-07 22:50:42.000000000 +0200
+++ splix/ppd/samsung.drv.in 2013-03-06 12:46:52.688837840 +0100
@@ -83,6 +83,7 @@ Manufacturer "Samsung"
PCFileName "ml1520.ppd"
} {
@ -9,7 +9,15 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
PCFileName "ml1610.ppd"
} {
ModelName "ML-1710"
@@ -166,6 +167,7 @@ Manufacturer "Samsung"
@@ -121,6 +122,7 @@ Manufacturer "Samsung"
Throughput 22
{
ModelName "ML-2250"
+ Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2250;"
PCFileName "ml2250.ppd"
} {
ModelName "ML-2251"
@@ -166,6 +168,7 @@ Manufacturer "Samsung"
PCFileName "ml1640.ppd"
} {
ModelName "ML-2010"
@ -17,7 +25,15 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
PCFileName "ml2010.ppd"
} {
ModelName "ML-2015"
@@ -193,6 +195,7 @@ Manufacturer "Samsung"
@@ -177,6 +180,7 @@ Manufacturer "Samsung"
#import "srtmode.defs"
ModelName "ML-2510"
+ Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2510 Series;CMD:GDI;"
PCFileName "ml2510.ppd"
}
}
@@ -193,6 +197,7 @@ Manufacturer "Samsung"
{
ModelName "ML-1660"
@ -25,7 +41,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
PCFileName "ml1660.ppd"
} {
ModelName "ML-1910"
@@ -202,9 +205,11 @@ Manufacturer "Samsung"
@@ -202,9 +207,11 @@ Manufacturer "Samsung"
PCFileName "ml1915.ppd"
} {
ModelName "ML-2525"
@ -39,8 +55,32 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
} {
diff -up splix/ppd/xerox.drv.in.deviceID splix/ppd/xerox.drv.in
--- splix/ppd/xerox.drv.in.deviceID 2011-07-21 17:22:26.000000000 +0200
+++ splix/ppd/xerox.drv.in 2012-10-17 16:06:16.180139508 +0200
@@ -131,6 +131,7 @@ Manufacturer "Xerox"
+++ splix/ppd/xerox.drv.in 2013-03-06 12:34:31.104078182 +0100
@@ -66,6 +66,7 @@ Manufacturer "Xerox"
} {
#import "manualduplex.defs"
ModelName "Phaser 3120"
+ Attribute "1284DeviceID" "" "MFG:Xerox;MDL:Phaser 3120;CMD:GDI;"
PCFileName "ph3120.ppd"
} {
#import "manualduplex.defs"
@@ -74,6 +75,7 @@ Manufacturer "Xerox"
} {
#import "manualduplex.defs"
ModelName "Phaser 3130"
+ Attribute "1284DeviceID" "" "MFG:Xerox;MDL:Phaser 3130;CMD:PCL5E,PCL6;"
PCFileName "ph3130.ppd"
} {
// Multi-tray
@@ -118,6 +120,7 @@ Manufacturer "Xerox"
{
ModelName "Phaser 3117"
+ Attribute "1284DeviceID" "" "MFG:Xerox;MDL:Phaser 3117;CMD:GDI;"
PCFileName "ph3117.ppd"
} {
Resolution k 1 0 0 0 "1200x600dpi/1200x600 DPI"
@@ -131,6 +134,7 @@ Manufacturer "Xerox"
{
ModelName "Phaser 3124"

5
splix.spec
View File

@ -3,7 +3,7 @@
Summary: Driver for QPDL/SPL2 printers (Samsung and several Xerox printers)
Name: splix
Version: 2.0.1
Release: 0.14.%{checkout}%{?dist}
Release: 0.15.%{checkout}%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://splix.sourceforge.net/
@ -63,6 +63,9 @@ make install DRV_ONLY=1 CUPSDRV=%{_datadir}/cups/drv/splix DESTDIR=%{buildroot}
%{_datadir}/cups/drv/splix
%changelog
* Wed Mar 06 2013 Jiri Popelka <jpopelka@redhat.com> - 2.0.1-0.15.20121128svn
- Add Device IDs for Samsung ML-2250/2510, Xerox Phaser 3117/3120/3130
* Tue Mar 5 2013 Tim Waugh <twaugh@redhat.com> - 2.0.1-0.14.20121128svn
- Build requires cups for postscriptdriver tags (bug #917333).