Compare commits

...

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

7 changed files with 195 additions and 23 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

30
.gitignore vendored
View File

@ -1,2 +1,30 @@
SOURCES/foomatic-db-4.0-20180102.tar.gz
foomatic-db-4.0-20090702.tar.gz
foomatic-db-hpijs-20090701.tar.gz
foomatic-db-4.0-20090819.tar.gz
foomatic-db-4.0-20091126.tar.gz
foomatic-db-4.0-20100204.tar.gz
/foomatic-db-4.0-20100819.tar.gz
/foomatic-db-hpijs-20090901.tar.gz
/foomatic-db-4.0-20101123.tar.gz
/foomatic-db-4.0-20110221.tar.gz
/foomatic-db-4.0-20110614.tar.gz
/foomatic-db-4.0-20120719.tar.gz
/foomatic-db-4.0-20121011.tar.gz
/foomatic-db-4.0-20130312.tar.gz
/foomatic-db-4.0-20130507.tar.gz
/foomatic-db-4.0-20130604.tar.gz
/foomatic-db-4.0-20130911.tar.gz
/foomatic-db-4.0-20131218.tar.gz
/foomatic-db-4.0-20140707.tar.gz
/foomatic-db-4.0-20150415.tar.gz
/foomatic-db-4.0-20150819.tar.gz
/foomatic-db-4.0-20161003.tar.gz
/foomatic-db-4.0-20170503.tar.gz
/foomatic-db-4.0-20180102.tar.gz
/foomatic-db-4.0-20180228.tar.gz
/foomatic-db-4.0-20190128.tar.gz
/foomatic-db-4.0-20200526.tar.gz
/foomatic-db-4.0-20201104.tar.gz
/foomatic-db-4.0-20210209.tar.gz
/foomatic-db-4.0-20210611.tar.gz
/foomatic-db-4.0-20230810.tar.gz

1
ci.fmf Normal file
View File

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

View File

@ -1,13 +1,15 @@
%global dbver_rel 4.0
# When you change dbver_snap, rebuild also foomatic against this build to pick up new IEEE 1284 Device IDs.
# The postscriptdriver tags get put onto foomatic, because that's there the actual CUPS driver lives.
%global dbver_snap 20180102
%global dbver_snap 20230810
Summary: Database of printers and printer drivers
Name: foomatic-db
Version: %{dbver_rel}
Release: 57.%{dbver_snap}%{?dist}
License: GPLv2+
Release: 82.%{dbver_snap}%{?dist}
# GPL-2.0-or-later non-PPD files and some PPDs
# MIT for ppds
License: GPL-2.0-or-later AND MIT
Requires: %{name}-filesystem = %{version}-%{release}
Requires: %{name}-ppds = %{version}-%{release}
@ -24,10 +26,15 @@ BuildRequires: python3-cups
# Build requires cups so that configure knows where to put PPDs.
BuildRequires: cups
# uses make
BuildRequires: make
# Build requires for perl
BuildRequires: perl-interpreter
# we needed sed for prep phase - removing perl from ppds
BuildRequires: sed
%description
This is the database of printers, printer drivers, and driver options
for Foomatic.
@ -36,14 +43,12 @@ The site http://www.openprinting.org/ is based on this database.
%package filesystem
Summary: Directory layout for the foomatic package
License: Public Domain
%description filesystem
Directory layout for the foomatic package.
%package ppds
Summary: PPDs from printer manufacturers
License: GPLv2+ and MIT
# We ship a symlink in a directory owned by cups
BuildRequires: cups
Requires: cups
@ -56,15 +61,18 @@ PPDs from printer manufacturers.
%prep
%setup -q -n foomatic-db-%{dbver_snap}
find -type d | xargs chmod g-s
find -type d | xargs -d '\n' chmod g-s
pushd db/source
# For gutenprint printers, use gutenprint-ijs-simplified.5.2.
perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.2<,' printer/*.xml
for i in printer/*.xml
do
perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.2<,' $i
done
# Remove references to SpliX (Samsung/Xerox/Dell)
find printer -name '*.xml' |xargs grep -l "<driver>splix"|xargs rm -vf
find printer -name '*.xml' |xargs -d '\n' grep -l "<driver>splix"|xargs -d '\n' rm -vf
rm -f driver/splix.xml
# Remove references to foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851).
@ -72,31 +80,32 @@ rm -f driver/splix.xml
# foo2lava, foo2kyo, foo2xqx (bug #438319)
# foo2slx and foo2hiperc (bug #518267)
# foo2hbpl2 (bug #970393)
for x in zjs zjs-z1 zjs-z2 zjs-z3 oak oak-z1 hp qpdl lava kyo xqx slx hiperc hbpl2
# foo2hiperc-z1
for x in zjs zjs-z1 zjs-z2 zjs-z3 oak oak-z1 hp qpdl lava kyo xqx slx hiperc hiperc-z1 hbpl2
do
find printer -name '*.xml' |xargs grep -l "<driver>foo2${x}"|xargs rm -vf
find printer -name '*.xml' |xargs -d '\n' grep -l "<driver>foo2${x}"|xargs -d '\n' rm -vf
rm -f driver/foo2${x}.xml opt/foo2${x}-*
done
# Binaries for these were previously provided by printer-filters, but aren't anymore (bug #972740)
for x in lm1100 pentaxpj pbm2l2030 pbm2l7k lex5700 lex7000 c2050 c2070 cjet
do
find printer -name '*.xml' |xargs grep -l "<driver>${x}</driver>"|xargs rm -vf
find printer -name '*.xml' |xargs -d '\n' grep -l "<driver>${x}</driver>"|xargs -d '\n' rm -vf
rm -vf driver/${x}.xml opt/${x}-*
done
# Same for all these.
for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j m2300w m2400w
do
find printer -name '*.xml' |xargs grep -l "<driver>${x}</driver>"|xargs rm -vf
find printer -name '*.xml' |xargs -d '\n' grep -l "<driver>${x}</driver>"|xargs -d '\n' rm -vf
rm -vf driver/${x}.xml opt/${x}-*
done
# Remove Samsung-CLP-610/620 (bug #967930), they're in foo2qpdl
find printer -name '*.xml' |grep -E 'Samsung-CLP-610|Samsung-CLP-620'|xargs rm -vf
find printer -name '*.xml' |grep -E 'Samsung-CLP-610|Samsung-CLP-620'|xargs -d '\n' rm -vf
# This one is part of foo2zjs
find printer -name '*.xml' |grep -E 'KONICA_MINOLTA-magicolor_2430_DL'|xargs rm -vf
find printer -name '*.xml' |grep -E 'KONICA_MINOLTA-magicolor_2430_DL'|xargs -d '\n' rm -vf
# Remove Brother P-touch (bug #560610, comment #10)
rm -vf driver/ptouch.xml
@ -116,13 +125,13 @@ popd
# HP DeskJet 720C (bug #797099)
# Kyocera FS-1118MFP (bug #782377)
# Brother HL-2040 (bug #999040)
%patch1 -p1
%patch -P 1 -p1
# These can't be generated at all (bug #866476)
%patch2 -p1
%patch -P 2 -p1
# Use sed instead of perl in the PPDs (bug #512739).
find db/source/PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
find db/source/PPD -type f -name '*.ppd' -exec sed -i 's,perl -p,sed,g' {} +
%build
%configure
@ -136,7 +145,7 @@ make DESTDIR=%buildroot PREFIX=%{_prefix} \
# Remove ghostscript UPP drivers that are gone in 7.07
rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
find %{buildroot}%{_datadir}/foomatic/db/source/ -type f | xargs chmod 0644
find %{buildroot}%{_datadir}/foomatic/db/source/ -type f | xargs -d '\n' chmod 0644
mkdir %{buildroot}%{_datadir}/foomatic/db/source/PPD/Custom
@ -171,6 +180,85 @@ ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic-
%{_datadir}/cups/model/foomatic-db-ppds
%changelog
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.0-82.20230810
- Bump release for June 2024 mass rebuild
* Fri May 17 2024 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-81.20230810
- RHEL-35698 add plans and gating
* Tue May 07 2024 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-80.20230810
- RHEL-35698 Remove/migrate additional license tags to SPDX
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-79.20230810
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-78.20230810
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Aug 11 2023 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-77.20230810
- update to foomatic-db-4.0-20230810
- fix xargs in %%prep to work with files with spaces
- fix rpm warnings about patch macros
- SPDX migration
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-76.20210611
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-75.20210611
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-74.20210611
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-73.20210611
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-72.20210611
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 11 2021 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-71.20210611
- updated to foomatic-db-4.0-20210611
* Wed Feb 10 2021 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-70.20210209
- updated to foomatic-db-4.0-20210209
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-69.20201104
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-68.20201104
- updated to foomatic-db-4.0-20201104
- make is no longer in buildroot by default
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-67.20200526
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-66.20200526
- Updated to foomatic-db-4.0-20200526
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-65.20190128
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-64.20190128
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-63.20190128
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 28 2019 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-62.20190128
- Updated to foomatic-db-4.0-20190128
* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-61.20180228
- 1603992 - foomatic-db: FTBFS in Fedora rawhide
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-60.20180228
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon May 28 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-59.20180228
- 1582865, 1470547 - remove foo2hiperc-z1
* Wed Feb 28 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-58.20180228
- Updated to foomatic-db-4.0-20180228
* Thu Feb 08 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-57.20180102
- remove old stuff https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/MRWOMRZ6KPCV25EFHJ2O67BCCP3L4Y6N/

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-db.git
name: /plans/tier1/internal
/tier1-public:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic-db.git
name: /plans/tier1/public
/tier2-tier3-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic-db.git
name: /plans/tier2-tier3/internal
/tier2-tier3-public:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic-db.git
name: /plans/tier2-tier3/public
/others-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic-db.git
name: /plans/others/internal
/others-public:
plan:
import:
url: https://src.fedoraproject.org/tests/foomatic-db.git
name: /plans/others/public

View File

@ -1 +1 @@
SHA512 (foomatic-db-4.0-20180102.tar.gz) = 36567c931963807deb8ba56bb008fca00f463dc7fa6d74222308d5f01b2690c2de5c096265623e5aed2a03777f1afa9171bc6dd1f0b5f27dc54c48d530656100
SHA512 (foomatic-db-4.0-20230810.tar.gz) = 6444956f65055478c843fdcdf0638ce185ec48275e77d5bc74a6c2c78acf309a8be6ca9f0e758dbe2991eab5851e79e73a470a77d1a5412f6f885e6f97db3774