Compare commits
No commits in common. "c8s" and "c9s" have entirely different histories.
16
.gitignore
vendored
16
.gitignore
vendored
@ -1,2 +1,16 @@
|
||||
SOURCES/foomatic-db-engine-4.0.12.tar.gz
|
||||
/foomatic-db-engine-4.0.5.tar.gz
|
||||
/foomatic-filters-4.0.5.tar.gz
|
||||
/foomatic-db-engine-4.0.6.tar.gz
|
||||
/foomatic-filters-4.0.6.tar.gz
|
||||
/foomatic-db-engine-4.0.7.tar.gz
|
||||
/foomatic-filters-4.0.7.tar.gz
|
||||
/foomatic-db-engine-4.0.8.tar.gz
|
||||
/foomatic-filters-4.0.8.tar.gz
|
||||
/foomatic-filters-4.0.13.tar.gz
|
||||
/foomatic-filters-4.0.15.tar.gz
|
||||
/foomatic-filters-4.0.17.tar.gz
|
||||
/foomatic-db-engine-4.0.9.tar.gz
|
||||
/foomatic-filters-4.0.17-clean.tar.gz
|
||||
/foomatic-db-engine-4.0.11.tar.gz
|
||||
/foomatic-db-engine-4.0.12.tar.gz
|
||||
/foomatic-db-engine-4.0.13.tar.gz
|
||||
|
41
0001-Recognize-fractional-numbers-in-PageSize.patch
Normal file
41
0001-Recognize-fractional-numbers-in-PageSize.patch
Normal file
@ -0,0 +1,41 @@
|
||||
From 75de02d9065b6280482d7cd011e9462badb19f83 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Gruenbacher <agruenba@redhat.com>
|
||||
Date: Thu, 30 Jan 2020 23:08:23 +0100
|
||||
Subject: [PATCH] Recognize fractional numbers in PageSize
|
||||
|
||||
Right now, fractional numbers (fractional pt sizes) aren't allowed in
|
||||
PageSize values even though they are perfectly fine in PPD files. In
|
||||
contrast, the values foomatic puts into the *ImageableArea and
|
||||
*PaperDimension definitions it generates are fractional. So allow
|
||||
fractional numbers in PageSize values as well.
|
||||
---
|
||||
lib/Foomatic/DB.pm | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/Foomatic/DB.pm b/lib/Foomatic/DB.pm
|
||||
index 90389b3..39739aa 100644
|
||||
--- a/lib/Foomatic/DB.pm
|
||||
+++ b/lib/Foomatic/DB.pm
|
||||
@@ -5533,7 +5533,7 @@ sub getppd ( $ $ $ ) {
|
||||
# option.
|
||||
my $size = $v->{'driverval'};
|
||||
if ($size =~ /([\d\.]+)x([\d\.]+)([a-z]+)\b/) {
|
||||
- # 2 positive integers separated by
|
||||
+ # 2 positive numbers separated by
|
||||
# an 'x' with a unit
|
||||
my $w = $1;
|
||||
my $h = $2;
|
||||
@@ -5551,8 +5551,8 @@ sub getppd ( $ $ $ ) {
|
||||
$w = sprintf("%.2f", $w) if $w =~ /\./;
|
||||
$h = sprintf("%.2f", $h) if $h =~ /\./;
|
||||
$size = "$w $h";
|
||||
- } elsif (($size =~ /(\d+)[x\s]+(\d+)/) ||
|
||||
- # 2 positive integers separated by
|
||||
+ } elsif (($size =~ /([\d\.]+)[x\s]+([\d\.]+)/) ||
|
||||
+ # 2 positive numbers separated by
|
||||
# whitespace or an 'x'
|
||||
($size =~ /\-dDEVICEWIDTHPOINTS\=(\d+)\s+\-dDEVICEHEIGHTPOINTS\=(\d+)/)) {
|
||||
# "-dDEVICEWIDTHPOINTS=..."/"-dDEVICEHEIGHTPOINTS=..."
|
||||
--
|
||||
2.25.4
|
||||
|
@ -1,16 +0,0 @@
|
||||
diff -up foomatic-db-engine-4.0.12/Makefile.in.ldflags foomatic-db-engine-4.0.12/Makefile.in
|
||||
--- foomatic-db-engine-4.0.12/Makefile.in.ldflags 2018-03-02 15:44:15.956764348 +0100
|
||||
+++ foomatic-db-engine-4.0.12/Makefile.in 2018-03-02 15:47:18.815459860 +0100
|
||||
@@ -231,10 +231,10 @@ lib/Makefile: lib/Makefile.PL
|
||||
( cd lib && $(PERL) Makefile.PL verbose INSTALLDIRS=$(PERL_INSTALLDIRS) )
|
||||
|
||||
foomatic-combo-xml: foomatic-combo-xml.c
|
||||
- $(CC) $(CFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
|
||||
|
||||
foomatic-perl-data: foomatic-perl-data.c
|
||||
- $(CC) $(CFLAGS) $(XML_CFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_LIBS)
|
||||
+ $(CC) $(CFLAGS) $(XML_CFLAGS) $(LDFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_LIBS)
|
||||
|
||||
man: lib/Foomatic/Defaults.pm
|
||||
chmod a+rx ./makeMan
|
@ -1,19 +1,16 @@
|
||||
Summary: Tools for using the foomatic database of printers and printer drivers
|
||||
Name: foomatic
|
||||
Version: 4.0.12
|
||||
Release: 23%{?dist}
|
||||
Version: 4.0.13
|
||||
Release: 19%{?dist}
|
||||
License: GPLv2+
|
||||
|
||||
# printer-filters package has gone (bug #967316, bug #1035450).
|
||||
Obsoletes: printer-filters < 1.1-8
|
||||
Provides: printer-filters = 1.1-8
|
||||
|
||||
# The database engine.
|
||||
Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{version}.tar.gz
|
||||
|
||||
## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
|
||||
Patch101: foomatic-manpages.patch
|
||||
Patch102: foomatic-ldflags.patch
|
||||
Patch101: foomatic-manpages.patch
|
||||
# backported from upstream https://github.com/OpenPrinting/foomatic-db-engine/commit/75de02d
|
||||
Patch102: 0001-Recognize-fractional-numbers-in-PageSize.patch
|
||||
|
||||
## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
|
||||
|
||||
@ -21,6 +18,8 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinti
|
||||
|
||||
# gcc is no longer in buildroot by default
|
||||
BuildRequires: gcc
|
||||
# uses make
|
||||
BuildRequires: make
|
||||
BuildRequires: perl-interpreter >= 3:5.8.1
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||
@ -65,8 +64,8 @@ The site http://www.linuxprinting.org/ is based on this database.
|
||||
|
||||
# Ship more manpages.
|
||||
%patch101 -p1 -b .manpages
|
||||
# use LDFLAGS during linking
|
||||
%patch102 -p1 -b .ldflags
|
||||
# backported from upstream https://github.com/OpenPrinting/foomatic-db-engine/commit/75de02d
|
||||
%patch102 -p1 -b .pagesize-fract
|
||||
|
||||
chmod a+x mkinstalldirs
|
||||
|
||||
@ -144,6 +143,64 @@ exit 0
|
||||
%{_var}/cache/foomatic
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.13-19
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.13-18
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Feb 10 2021 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.13-17
|
||||
- rebuilt with new foomatic-db
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.13-15
|
||||
- rebuilt with new foomatic-db, use make
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jun 26 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.13-13
|
||||
- Perl 5.32 re-rebuild of bootstrapped packages
|
||||
|
||||
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.13-12
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Tue May 26 2020 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.13-11
|
||||
- recognize fractial numbers in PageSize (backport from upstream)
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.13-8
|
||||
- Perl 5.30 re-rebuild of bootstrapped packages
|
||||
|
||||
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.13-7
|
||||
- Perl 5.30 rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Jan 28 2019 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.13-5
|
||||
- rebuilt for new foomatic-db snapshot
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.13-3
|
||||
- Perl 5.28 re-rebuild of bootstrapped packages
|
||||
|
||||
* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.13-2
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Mon Mar 05 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.13-1
|
||||
- 4.0.13
|
||||
|
||||
* Fri Mar 02 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.12-23
|
||||
- 1549741 - foomatic: Partial build flags injection
|
||||
|
||||
|
@ -1,7 +1,8 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (foomatic-db-engine-4.0.12.tar.gz) = b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f
|
||||
SHA512 (foomatic-db-engine-4.0.13.tar.gz) = da6a0dd9c0d7935d59a4bdd5454c1b7dcb81508f17a98ebfb9fd50fb6b5ed593f4b226715030f22c082c5328c7f7e99d775eeadcb444db5c8ad1441a11a179bf
|
||||
|
Loading…
Reference in New Issue
Block a user