diff --git a/sane-backends.spec b/sane-backends.spec index 87f1eaf..8a79a47 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -7,7 +7,7 @@ %define gphoto2_support 0%{!?_without_gphoto2:1} %define gphoto2_split 0%{!?_without_gphoto2:%{?_with_gphoto2_split:1}} -%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5 +%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 %define libs_split 0%{?!_without_libs_split:1} %define docs_split 0%{?_with_docs_split:1} %else @@ -18,7 +18,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.18 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) Group: System Environment/Libraries Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz @@ -76,7 +76,7 @@ Summary: SANE libraries Group: System Environment/Libraries Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: sane-backends <= 1.0.17-12 -%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5 +%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 %if ! %{docs_split} Obsoletes: sane-backends-docs <= 1.0.17-12 Provides: sane-backends-docs = %{?epoch:%{epoch}:}%{version}-%{release} @@ -228,6 +228,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/sane-backends.pc %changelog +* Fri Oct 13 2006 Nils Philippsen - 1.0.18-5 +- use %%rhel, not %%redhat + * Fri Oct 13 2006 Nils Philippsen - 1.0.18-4 - don't ship generated docs in -libs but main package (#210572)