diff --git a/foomatic-db.spec b/foomatic-db.spec index 99c6d15..f7bcc21 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: 41.%{dbver_snap}%{?dist} +Release: 42.%{dbver_snap}%{?dist} License: GPLv2+ Group: System Environment/Libraries Requires: %{name}-filesystem = %{version}-%{release} @@ -64,8 +64,10 @@ pushd db/source # For gutenprint printers, use gutenprint-ijs-simplified.5.2. perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.2<,' printer/*.xml -# Remove Samsung-CLP-300/315 (bug #625505), Samsung-CLP-610/620 (bug #967930) -find printer -name '*.xml' |grep -E 'Samsung-CLP-300|Samsung-CLP-315|Samsung-CLP-610|Samsung-CLP-620'|xargs rm -vf +# Remove references to SpliX (Samsung/Xerox/Dell) +find printer -name '*.xml' |xargs grep -l "splix"|xargs rm -vf +rm -f driver/splix.xml + # Remove references to foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851). # foo2zjs-z1, foo2zjs-z2, foo2zjs-z3 (bug #967930) # foo2lava, foo2kyo, foo2xqx (bug #438319) @@ -76,22 +78,27 @@ do find printer -name '*.xml' |xargs grep -l "foo2${x}"|xargs rm -vf rm -f driver/foo2${x}.xml opt/foo2${x}-* done -# Same for m2300w/m2400w -find printer -name '*.xml' |xargs grep -l 'm2[34]00w<'|xargs rm -vf -rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-* + # 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 "${x}"|xargs rm -vf rm -vf driver/${x}.xml opt/${x}-* done + # Same for all these. -for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j +for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j m2300w m2400w do find printer -name '*.xml' |xargs grep -l "${x}"|xargs 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 + +# This one is part of foo2zjs +find printer -name '*.xml' |grep -E 'KONICA_MINOLTA-magicolor_2430_DL'|xargs rm -vf + # Remove Brother P-touch (bug #560610, comment #10) rm -vf driver/ptouch.xml rm -vf printer/Brother-PT-*.xml @@ -161,6 +168,9 @@ ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic- %{_datadir}/cups/model/foomatic-db-ppds %changelog +* Wed Dec 18 2013 Jiri Popelka - 4.0-42.20131218 +- Remove references to splix and KONICA_MINOLTA-magicolor_2430_DL (bug #970393) + * Wed Dec 18 2013 Jiri Popelka - 4.0-41.20131218 - Remove references to invalid printers (bug #866476, bug #972740) - Remove references to foo2hbpl (bug #970393)