rpms/foomatic/devel foomatic-margins.patch, NONE, 1.1 foomatic.spec, 1.161, 1.162

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32558

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-margins.patch 
Log Message:
* Thu Jun 14 2007 Tim Waugh <twaugh at redhat.com>
- Safe default margins for PPDs (bug #244161).


foomatic-margins.patch:

--- NEW FILE foomatic-margins.patch ---
--- foomatic-db-engine-3.0-20070614/lib/Foomatic/DB.pm.margins	2007-06-14 11:42:16.000000000 +0100
+++ foomatic-db-engine-3.0-20070614/lib/Foomatic/DB.pm	2007-06-14 11:43:13.000000000 +0100
@@ -4289,9 +4289,10 @@
 sub getmargins {
     my ($dat, $width, $height, $pagesize) = @_;
     # Determine the unprintable margins
-    # Zero margins when no margin info exists
+    # Safe margins when no margin info exists
+    my $border = 36;
     my ($left, $right, $top, $bottom) =
-	(0, $width, $height, 0);
+	($border, $width - $border, $height - $border, $border);
     # Margins from printer database entry
     my ($pleft, $pright, $ptop, $pbottom) =
 	getmarginsformarginrecord($dat->{'printermargins'}, 


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- foomatic.spec	14 Jun 2007 11:21:09 -0000	1.161
+++ foomatic.spec	14 Jun 2007 11:27:42 -0000	1.162
@@ -43,6 +43,9 @@
 # Missing IEEE 1284 IDs.
 Patch16: foomatic-ieee1284.patch
 
+# Safe default margins for PPDs (bug #244161).
+Patch17: foomatic-margins.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -96,6 +99,7 @@
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
+%patch17 -p1 -b .margins
 ./make_configure
 popd
 
@@ -252,6 +256,7 @@
 
 %changelog
 * Thu Jun 14 2007 Tim Waugh <twaugh at redhat.com>
+- Safe default margins for PPDs (bug #244161).
 - Added missing IEEE 1284 ID for HP Photosmart 380 (bug #241352).
 
 * Thu Jun 14 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-48