From 00c46b6b9f3b7f3ac51818226ffbb61309802ff1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Jul 24 2018 15:34:33 +0000 Subject: 1603992 - foomatic-db: FTBFS in Fedora rawhide --- diff --git a/foomatic-db.spec b/foomatic-db.spec index 09e0696..ea85865 100644 --- a/foomatic-db.spec +++ b/foomatic-db.spec @@ -6,7 +6,7 @@ Summary: Database of printers and printer drivers Name: foomatic-db Version: %{dbver_rel} -Release: 60.%{dbver_snap}%{?dist} +Release: 61.%{dbver_snap}%{?dist} License: GPLv2+ Requires: %{name}-filesystem = %{version}-%{release} Requires: %{name}-ppds = %{version}-%{release} @@ -28,6 +28,9 @@ BuildRequires: cups # 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. @@ -61,7 +64,10 @@ find -type d | xargs 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 "splix"|xargs rm -vf @@ -123,7 +129,7 @@ popd %patch2 -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 @@ -172,6 +178,9 @@ ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic- %{_datadir}/cups/model/foomatic-db-ppds %changelog +* Tue Jul 24 2018 Zdenek Dohnal - 4.0-61.20180228 +- 1603992 - foomatic-db: FTBFS in Fedora rawhide + * Fri Jul 13 2018 Fedora Release Engineering - 4.0-60.20180228 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild