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

Merge branch 'f19'

Browse Source
This commit is contained in:
Tim Waugh 2013-06-18 17:06:18 +01:00
commit f67efaa869
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cups-dymo-deviceid.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up cups-1.6.2/ppdc/sample.drv.dymo-deviceid cups-1.6.2/ppdc/sample.drv
--- cups-1.6.2/ppdc/sample.drv.dymo-deviceid 2013-06-18 16:57:02.110662953 +0100
+++ cups-1.6.2/ppdc/sample.drv 2013-06-18 16:58:56.513989117 +0100
@@ -125,6 +125,7 @@ Version "1.5"
{
Manufacturer "Dymo"
ModelName "Label Printer"
+ Attribute "1284DeviceID" "" "MFG:DYMO;MDL:LabelWriter 400;"
Attribute NickName "" "Dymo Label Printer"
PCFileName "dymo.ppd"
DriverType label

8
cups.spec
View File

@ -14,7 +14,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7 Version: 1.7
Release: 0.5.%{prever}%{?dist} Release: 0.6.%{prever}%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -61,6 +61,7 @@ Patch27: cups-avahi-address.patch
Patch28: cups-17b1-va_list.patch Patch28: cups-17b1-va_list.patch
Patch29: cups-enum-all.patch Patch29: cups-enum-all.patch
Patch30: cups-stringpool-setprinterattr.patch Patch30: cups-stringpool-setprinterattr.patch
Patch31: cups-dymo-deviceid.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -236,6 +237,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch29 -p1 -b .enum-all %patch29 -p1 -b .enum-all
# Prevent stringpool damage leading to memory leaks (bug #974048). # Prevent stringpool damage leading to memory leaks (bug #974048).
%patch30 -p1 -b .stringpool-setprinterattr %patch30 -p1 -b .stringpool-setprinterattr
# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
%patch31 -p1 -b .dymo-deviceid
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -637,6 +640,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Tue Jun 18 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.6.b1
- Added IEEE 1284 Device ID for a Dymo device (bug #747866).
* Thu Jun 13 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.5.b1 * Thu Jun 13 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.5.b1
- Prevent stringpool damage leading to memory leaks (bug #974048). - Prevent stringpool damage leading to memory leaks (bug #974048).