[openvas-client] merged changes from el to allow fast-forward merge

[rebus]

commit 3ff7e08a32e5438080cac2c2f443dcc017953936
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Thu Apr 14 00:00:01 2011 +0200

    merged changes from el to allow fast-forward merge

 openvas-client.spec |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/openvas-client.spec b/openvas-client.spec
index ff9b875..b74007a 100644
--- a/openvas-client.spec
+++ b/openvas-client.spec
@@ -1,7 +1,7 @@
 Name:		openvas-client
 Summary:	Client component of Open Vulnerability Assessment (OpenVAS) Scanner
 Version:	3.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.openvas.org
 License:	GPLv2 and GPLv2+
 Group:		Applications/System
@@ -30,10 +30,17 @@ BuildRequires:	gtk2-devel
 BuildRequires:	gpgme-devel
 BuildRequires:	gnutls-devel
 BuildRequires:	openssl-devel
+%if %{defined rhel}
 %if 0%{?rhel} <= 5
-BuildRequires:	e2fsprogs-libs-devel
+#RHEL5
+BuildRequires:  e2fsprogs-libs-devel
 %else
-BuildRequires:	libuuid-devel
+#RHEL6
+BuildRequires:  libuuid-devel
+%endif
+%else
+#Fedora 14 doesn't have "rhel" defined
+BuildRequires:  libuuid-devel
 %endif
 BuildRequires:	atk-devel
 BuildRequires:	pango-devel
@@ -100,6 +107,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Wed Apr 13 2011 Michal Ambroz <rebus at, seznam.cz> - 3.0.3-2
+- merge changes from el to master to allow fastforward merging
+
 * Fri Mar 18 2011 Michal Ambroz <rebus at, seznam.cz> - 3.0.3-1
 - Bump to latest stable release 4