rpms/foomatic-db
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove some file conflicts (bug #967930)

Browse Source
This commit is contained in:
Jiri Popelka 2013-06-04 11:40:41 +02:00
parent 915ad1240a
commit 75bac88e37
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ foomatic-db-4.0-20100204.tar.gz
/foomatic-db-4.0-20121011.tar.gz
/foomatic-db-4.0-20130312.tar.gz
/foomatic-db-4.0-20130507.tar.gz
/foomatic-db-4.0-20130604.tar.gz

19
foomatic-db.spec
View File

@ -1,10 +1,10 @@
%global dbver_rel 4.0
%global dbver_snap 20130507
%global dbver_snap 20130604
Summary: Database of printers and printer drivers
Name: foomatic-db
Version: %{dbver_rel}
Release: 37.%{dbver_snap}%{?dist}
Release: 38.%{dbver_snap}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Requires: %{name}-filesystem = %{version}-%{release}
@ -61,12 +61,13 @@ 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, Samsung-CLP-315 (bug #625505)
find printer -name '*.xml' |grep -E 'Samsung-CLP-300|Samsung-CLP-315'|xargs rm -vf
# 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 foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851).
# Also foo2lava, foo2kyo, foo2xqx (bug #438319).
# Also foo2slx and foo2hiperc (bug #518267).
for x in zjs oak oak-z1 hp qpdl lava kyo xqx slx hiperc
# foo2zjs-z1, foo2zjs-z2, foo2zjs-z3 (bug #967930)
# foo2lava, foo2kyo, foo2xqx (bug #438319)
# foo2slx and foo2hiperc (bug #518267)
for x in zjs zjs-z1 zjs-z2 zjs-z3 oak oak-z1 hp qpdl lava kyo xqx slx hiperc
do
find printer -name '*.xml' |xargs grep -l "<driver>foo2${x}"|xargs rm -vf
rm -f driver/foo2${x}.xml opt/foo2${x}-*
@ -146,6 +147,10 @@ ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic-
%{_datadir}/cups/model/foomatic-db-ppds
%changelog
* Tue Jun 04 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0-38.20130604
- Remove some file conflicts (bug #967930)
- Updated to foomatic-db-4.0-20130604
* Tue May 07 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0-37.20130507
- Updated to foomatic-db-4.0-20130507
- Removed old 'Obsoletes: oki4linux'

2
sources
View File

@ -1 +1 @@
b17f17482f52b95fec9087db66f1f160 foomatic-db-4.0-20130507.tar.gz
8a8ac2a3f96d295705669b8d2ee05dd6 foomatic-db-4.0-20130604.tar.gz