rpms/sane-backends/FC-5 sane-backends.spec,1.62,1.63

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Oct 13 12:01:44 UTC 2006


Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10281

Modified Files:
	sane-backends.spec 
Log Message:
use %rhel, not %redhat
Resolves: #210572



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-5/sane-backends.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sane-backends.spec	13 Oct 2006 10:00:23 -0000	1.62
+++ sane-backends.spec	13 Oct 2006 12:01:42 -0000	1.63
@@ -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 @@
 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 @@
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Fri Oct 13 2006 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-5
+- use %%rhel, not %%redhat
+
 * Fri Oct 13 2006 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-4
 - don't ship generated docs in -libs but main package (#210572)
 




More information about the fedora-cvs-commits mailing list