rpms/ldapvi/F-11 ldapvi.spec,1.9,1.10

[Matej Cepl]

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27851

Modified Files:
	ldapvi.spec 
Log Message:
Make .spec file universal for Fedora and RHEL (fixes #543913)


Index: ldapvi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapvi/F-11/ldapvi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ldapvi.spec	19 Sep 2009 20:41:40 -0000	1.9
+++ ldapvi.spec	7 Dec 2009 11:09:31 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           ldapvi
 Version:        1.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        An interactive LDAP client
 
 Group:          Applications/Editors
@@ -12,8 +12,12 @@ Patch1:         %{name}-1.7-getline.patc
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
-BuildRequires:  popt-devel, libxslt, glib2-devel, openssl-devel
-
+BuildRequires:  libxslt, glib2-devel, openssl-devel
+%if 0%{?rhel}
+BuildRequires: popt
+%else
+BuildRequires: popt-devel
+%endif
 
 %description
 ldapvi is an interactive LDAP client for Unix terminals. Using it, you can
@@ -51,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 07 2009 Matěj Cepl <mcepl at redhat.com> - 1.7-10
+- Improving .spec file to work both on Fedora and RHEL
+
 * Fri Sep 18 2009 Matěj Cepl <mcepl at redhat.com> - 1.7-9
 - Fixed build to cure FTBFS (#511746)
   Thanks for sharkcz for making the patch