Compare commits

...

No commits in common. "c8s" and "c10s" have entirely different histories.
c8s ... c10s

9 changed files with 229 additions and 38 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

16
.gitignore vendored
View File

@ -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

View 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
ci.fmf Normal file
View File

@ -0,0 +1 @@
resultsdb-testcase: separate

View File

@ -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

View File

@ -1,26 +1,27 @@
Summary: Tools for using the foomatic database of printers and printer drivers
Name: foomatic
Version: 4.0.12
Release: 23%{?dist}
License: GPLv2+
# printer-filters package has gone (bug #967316, bug #1035450).
Obsoletes: printer-filters < 1.1-8
Provides: printer-filters = 1.1-8
Version: 4.0.13
Release: 33%{?dist}
License: GPL-2.0-or-later
# 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)
Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic
Url: https://github.com/OpenPrinting/foomatic-db-engine
# gcc is no longer in buildroot by default
BuildRequires: gcc
# for autosetup
BuildRequires: git-core
# uses make
BuildRequires: make
BuildRequires: perl-interpreter >= 3:5.8.1
BuildRequires: perl-generators
BuildRequires: perl(ExtUtils::MakeMaker)
@ -38,7 +39,6 @@ BuildRequires: foomatic, foomatic-db
Requires: dbus
Requires: cups-filters >= 1.0.42
Requires: perl-interpreter >= 3:5.8.1
Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
Requires(post): coreutils
Requires: foomatic-db
Requires: cups
@ -61,12 +61,7 @@ queues (foomatic-configure) and to print files/manipulate jobs
The site http://www.linuxprinting.org/ is based on this database.
%prep
%setup -q -n foomatic-db-engine-%{version}
# Ship more manpages.
%patch101 -p1 -b .manpages
# use LDFLAGS during linking
%patch102 -p1 -b .ldflags
%autosetup -n foomatic-db-engine-%{version} -S git
chmod a+x mkinstalldirs
@ -144,6 +139,107 @@ exit 0
%{_var}/cache/foomatic
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 4.0.13-33
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.0.13-32
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Aug 11 2023 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.13-29
- Rebuild with new foomatic-db
- SPDX migration
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jan 12 2023 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.13-26
- URL changed to github
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jun 03 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.13-24
- Perl 5.36 re-rebuild of bootstrapped packages
* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.13-23
- Perl 5.36 rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.13-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 11 2021 Zdenek Dohnal <zdohnal@redhat.com> - 4.0.13-20
- rebuild with new foomatic-db
* Mon May 24 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.13-19
- Perl 5.34 re-rebuild of bootstrapped packages
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.13-18
- Perl 5.34 rebuild
* 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

View File

@ -1,7 +1,25 @@
--- !Policy
product_versions:
- rhel-8
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#Rawhide
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#gating rhel
--- !Policy
product_versions:
- rhel-*
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: osci.brew-build./plans/tier1-public.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

36
plans.fmf Normal file
View File

@ -0,0 +1,36 @@
/tier1-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic.git
name: /plans/tier1/internal
/tier1-public:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic.git
name: /plans/tier1/public
/tier2-tier3-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic.git
name: /plans/tier2-tier3/internal
/tier2-tier3-public:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic.git
name: /plans/tier2-tier3/public
/others-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic.git
name: /plans/others/internal
/others-public:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic.git
name: /plans/others/public

View File

@ -1 +1 @@
SHA512 (foomatic-db-engine-4.0.12.tar.gz) = b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f
SHA512 (foomatic-db-engine-4.0.13.tar.gz) = da6a0dd9c0d7935d59a4bdd5454c1b7dcb81508f17a98ebfb9fd50fb6b5ed593f4b226715030f22c082c5328c7f7e99d775eeadcb444db5c8ad1441a11a179bf