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

- Updated db-engine to 3.0-20071218.

Browse Source
This commit is contained in:
Tim Waugh 2008-01-09 16:40:05 +00:00
parent 762cf8370f
commit 88ce8a79a0
4 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -46,3 +46,4 @@ foomatic-db-3.0-20070614.tar.gz
foomatic-db-3.0-20070919.tar.gz foomatic-db-3.0-20070919.tar.gz
foomatic-filters-3.0-20070919.tar.gz foomatic-filters-3.0-20070919.tar.gz
foomatic-filters-3.0-20071218.tar.gz foomatic-filters-3.0-20071218.tar.gz
foomatic-db-engine-3.0-20071218.tar.gz

15
foomatic-margins.patch
View File

@ -1,15 +0,0 @@
--- 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'},

9
foomatic.spec
View File

@ -1,5 +1,5 @@
%define dbver 20070919 %define dbver 20070919
%define enginever 3.0-20070614 %define enginever 3.0-20071218
%define filtersver 20071218 %define filtersver 20071218
%define hpijsver 20070614 %define hpijsver 20070614
@ -43,9 +43,6 @@ Patch15: foomatic-bad-utf8.patch
# Missing IEEE 1284 IDs. # Missing IEEE 1284 IDs.
Patch16: foomatic-ieee1284.patch Patch16: foomatic-ieee1284.patch
# Safe default margins for PPDs (bug #244161).
Patch17: foomatic-margins.patch
Url: http://www.linuxprinting.org Url: http://www.linuxprinting.org
BuildRequires: perl >= 3:5.8.1 BuildRequires: perl >= 3:5.8.1
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker)
@ -99,7 +96,6 @@ chmod a+x mkinstalldirs
%patch14 -p1 -b .ampathxml %patch14 -p1 -b .ampathxml
%patch10 -p1 -b .xml-cflags %patch10 -p1 -b .xml-cflags
%patch15 -p1 %patch15 -p1
%patch17 -p1 -b .margins
./make_configure ./make_configure
popd popd
@ -249,7 +245,8 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
%changelog %changelog
* Wed Jan 9 2008 Tim Waugh <twaugh@redhat.com> * Wed Jan 9 2008 Tim Waugh <twaugh@redhat.com>
- Updated filters to 20071218 (bug #416881). - Updated db-engine to 3.0-20071218.
- Updated filters to 3.0-20071218 (bug #416881).
* Fri Oct 12 2007 Tim Waugh <twaugh@redhat.com> 3.0.2-52 * Fri Oct 12 2007 Tim Waugh <twaugh@redhat.com> 3.0.2-52
- Removed use of printconf hooks. - Removed use of printconf hooks.

3
sources
View File

@ -1,5 +1,4 @@
38de62f4ac1a50a857e1122517e6b537 foomatic-db-hpijs-20070614.tar.gz 38de62f4ac1a50a857e1122517e6b537 foomatic-db-hpijs-20070614.tar.gz
e0a1851c3cd04b6e074e0863286adef8 foomatic-db-engine-3.0-20070614.tar.gz
fd8968c7500462d9661a1925c99b9441 foomatic-db-3.0-20070919.tar.gz fd8968c7500462d9661a1925c99b9441 foomatic-db-3.0-20070919.tar.gz
edc1e340b90d55240d84299bec75b9c7 foomatic-filters-3.0-20070919.tar.gz
69282efbc0bb8c72840eea638ac7dc71 foomatic-filters-3.0-20071218.tar.gz 69282efbc0bb8c72840eea638ac7dc71 foomatic-filters-3.0-20071218.tar.gz
29dcaf35a01bd64664215aa2489d43b9 foomatic-db-engine-3.0-20071218.tar.gz