Compare commits

...

No commits in common. 'c9' and 'i10c-beta' have entirely different histories.

@ -1 +1 @@
1794e3b3d3f5dc6154cdf4d4f4af503b0dbeed48 SOURCES/foomatic-db-4.0-20210209.tar.gz 34f85ac89b64b64e853b8cc39c07fd31f5b26f53 SOURCES/foomatic-db-4.0-20230810.tar.gz

2
.gitignore vendored

@ -1 +1 @@
SOURCES/foomatic-db-4.0-20210209.tar.gz SOURCES/foomatic-db-4.0-20230810.tar.gz

@ -1,13 +1,15 @@
%global dbver_rel 4.0 %global dbver_rel 4.0
# When you change dbver_snap, rebuild also foomatic against this build to pick up new IEEE 1284 Device IDs. # 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. # The postscriptdriver tags get put onto foomatic, because that's there the actual CUPS driver lives.
%global dbver_snap 20210209 %global dbver_snap 20230810
Summary: Database of printers and printer drivers Summary: Database of printers and printer drivers
Name: foomatic-db Name: foomatic-db
Version: %{dbver_rel} Version: %{dbver_rel}
Release: 72.%{dbver_snap}%{?dist} Release: 82.%{dbver_snap}%{?dist}
License: GPLv2+ # 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}-filesystem = %{version}-%{release}
Requires: %{name}-ppds = %{version}-%{release} Requires: %{name}-ppds = %{version}-%{release}
@ -41,14 +43,12 @@ The site http://www.openprinting.org/ is based on this database.
%package filesystem %package filesystem
Summary: Directory layout for the foomatic package Summary: Directory layout for the foomatic package
License: Public Domain
%description filesystem %description filesystem
Directory layout for the foomatic package. Directory layout for the foomatic package.
%package ppds %package ppds
Summary: PPDs from printer manufacturers Summary: PPDs from printer manufacturers
License: GPLv2+ and MIT
# We ship a symlink in a directory owned by cups # We ship a symlink in a directory owned by cups
BuildRequires: cups BuildRequires: cups
Requires: cups Requires: cups
@ -61,7 +61,7 @@ PPDs from printer manufacturers.
%prep %prep
%setup -q -n foomatic-db-%{dbver_snap} %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 pushd db/source
@ -72,7 +72,7 @@ do
done done
# Remove references to SpliX (Samsung/Xerox/Dell) # 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 rm -f driver/splix.xml
# Remove references to foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851). # Remove references to foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851).
@ -83,29 +83,29 @@ rm -f driver/splix.xml
# foo2hiperc-z1 # 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 for x in zjs zjs-z1 zjs-z2 zjs-z3 oak oak-z1 hp qpdl lava kyo xqx slx hiperc hiperc-z1 hbpl2
do 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}-* rm -f driver/foo2${x}.xml opt/foo2${x}-*
done done
# Binaries for these were previously provided by printer-filters, but aren't anymore (bug #972740) # 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 for x in lm1100 pentaxpj pbm2l2030 pbm2l7k lex5700 lex7000 c2050 c2070 cjet
do 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}-* rm -vf driver/${x}.xml opt/${x}-*
done done
# Same for all these. # Same for all these.
for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j m2300w m2400w for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j m2300w m2400w
do 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}-* rm -vf driver/${x}.xml opt/${x}-*
done done
# Remove Samsung-CLP-610/620 (bug #967930), they're in foo2qpdl # 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 # 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) # Remove Brother P-touch (bug #560610, comment #10)
rm -vf driver/ptouch.xml rm -vf driver/ptouch.xml
@ -125,10 +125,10 @@ popd
# HP DeskJet 720C (bug #797099) # HP DeskJet 720C (bug #797099)
# Kyocera FS-1118MFP (bug #782377) # Kyocera FS-1118MFP (bug #782377)
# Brother HL-2040 (bug #999040) # Brother HL-2040 (bug #999040)
%patch1 -p1 %patch -P 1 -p1
# These can't be generated at all (bug #866476) # 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). # Use sed instead of perl in the PPDs (bug #512739).
find db/source/PPD -type f -name '*.ppd' -exec sed -i 's,perl -p,sed,g' {} + find db/source/PPD -type f -name '*.ppd' -exec sed -i 's,perl -p,sed,g' {} +
@ -145,7 +145,7 @@ make DESTDIR=%buildroot PREFIX=%{_prefix} \
# Remove ghostscript UPP drivers that are gone in 7.07 # 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 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 mkdir %{buildroot}%{_datadir}/foomatic/db/source/PPD/Custom
@ -180,12 +180,47 @@ ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic-
%{_datadir}/cups/model/foomatic-db-ppds %{_datadir}/cups/model/foomatic-db-ppds
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.0-72.20210209 * Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.0-82.20230810
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for MSVSphere 10
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4.0-71.20210209 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.0-82.20230810
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - 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 * Wed Feb 10 2021 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-70.20210209
- updated to foomatic-db-4.0-20210209 - updated to foomatic-db-4.0-20210209

Loading…
Cancel
Save