- GPL version, __rm macro, other cosmetics

diff --git a/foomatic-db.spec b/foomatic-db.spec
index 2ef40b0eee2febb6272ecdb0db49832cbd2b74d9..53f78860af601d6dad36ba7bb301ed5ab68d84bd 100644 (file)
--- a/foomatic-db.spec
+++ b/foomatic-db.spec
@@ -4,15 +4,15 @@ Summary(pl.UTF-8):    Baza danych dla foomatic
 Name:          foomatic-db
 Version:       20110615
 Release:       1
-License:       GPL
+License:       GPL v2+
 Group:         Applications/System
 # foomatic db engine version
-%define                _fev    4.0
-Source0:       http://www.linuxprinting.org/download/foomatic/%{name}-%{_fev}-%{version}.tar.gz
+%define                fdbeng_ver      4.0
+Source0:       http://www.linuxprinting.org/download/foomatic/%{name}-%{fdbeng_ver}-%{version}.tar.gz
 # Source0-md5: f01fb27f96d3ec1e3b59dc860c64c52b
 URL:           http://www.linuxprinting.org/foomatic.html
-Requires:      foomatic-db-engine >= 4.0.20110615
 BuildRequires: bash
+Requires:      foomatic-db-engine >= 4.0.20110615
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # We don't need PPD files in this package
-rm -fr $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -46,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README USAGE
-%{_datadir}/foomatic/db/source/driver/*
-%{_datadir}/foomatic/db/source/opt/*
-%{_datadir}/foomatic/db/source/printer/*
+%{_datadir}/foomatic/db/source/driver/*.xml
+%{_datadir}/foomatic/db/source/opt/*.xml
+%{_datadir}/foomatic/db/source/printer/*.xml
 %{_datadir}/foomatic/db/oldprinterids