From 1d0077b5afadb6cbd8c61331d60e383f70c05ef7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 11 Aug 2023 17:09:15 +0200 Subject: [PATCH] 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 --- .gitignore | 1 + foomatic-db.spec | 18 ++++++++++++------ sources | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5cbbce3..d3b5c8c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ foomatic-db-4.0-20100204.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 diff --git a/foomatic-db.spec b/foomatic-db.spec index 85251d4..fdb88e8 100644 --- a/foomatic-db.spec +++ b/foomatic-db.spec @@ -1,13 +1,13 @@ %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 20210611 +%global dbver_snap 20230810 Summary: Database of printers and printer drivers Name: foomatic-db Version: %{dbver_rel} -Release: 76.%{dbver_snap}%{?dist} -License: GPLv2+ +Release: 77.%{dbver_snap}%{?dist} +License: GPL-2.0-or-later Requires: %{name}-filesystem = %{version}-%{release} Requires: %{name}-ppds = %{version}-%{release} @@ -61,7 +61,7 @@ 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 @@ -125,10 +125,10 @@ 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' -exec sed -i 's,perl -p,sed,g' {} + @@ -180,6 +180,12 @@ ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic- %{_datadir}/cups/model/foomatic-db-ppds %changelog +* Fri Aug 11 2023 Zdenek Dohnal - 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 - 4.0-76.20210611 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index c3610b1..1456ed3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (foomatic-db-4.0-20210611.tar.gz) = b6d2526f6c392620f1bb1511063ff8c709f66a8b20ee2f9026017884d29b80cdf52727d6c44f98559f2b461c2cabeb3c672284af7218a4316921ff1698499d27 +SHA512 (foomatic-db-4.0-20230810.tar.gz) = 6444956f65055478c843fdcdf0638ce185ec48275e77d5bc74a6c2c78acf309a8be6ca9f0e758dbe2991eab5851e79e73a470a77d1a5412f6f885e6f97db3774