More xargs fixes and fix license
This commit is contained in:
parent
4be12958e3
commit
3e5e18e582
@ -9,8 +9,7 @@ Version: %{dbver_rel}
|
|||||||
Release: 77.%{dbver_snap}%{?dist}
|
Release: 77.%{dbver_snap}%{?dist}
|
||||||
# GPL-2.0-or-later non-PPD files and some PPDs
|
# GPL-2.0-or-later non-PPD files and some PPDs
|
||||||
# MIT for ppds
|
# MIT for ppds
|
||||||
# PPD MIT for some ppds https://gitlab.com/fedora/legal/fedora-license-data/-/issues/295
|
License: GPL-2.0-or-later AND MIT
|
||||||
License: GPL-2.0-or-later AND MIT AND MIT-PPD
|
|
||||||
Requires: %{name}-filesystem = %{version}-%{release}
|
Requires: %{name}-filesystem = %{version}-%{release}
|
||||||
Requires: %{name}-ppds = %{version}-%{release}
|
Requires: %{name}-ppds = %{version}-%{release}
|
||||||
|
|
||||||
@ -75,7 +74,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).
|
||||||
@ -86,29 +85,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
|
||||||
@ -148,7 +147,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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user