rpms/ldapvi/EL-5 ldapvi.spec,1.1,1.2

[Matej Cepl]

Author: mcepl

Update of /cvs/pkgs/rpms/ldapvi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29681

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/EL-5/ldapvi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ldapvi.spec	6 Jul 2007 09:14:15 -0000	1.1
+++ ldapvi.spec	7 Dec 2009 11:15:09 -0000	1.2
@@ -1,18 +1,23 @@
 Name:           ldapvi
 Version:        1.7
-Release:        1%{?dist}
+Release:        10%{?dist}
 Summary:        An interactive LDAP client
 
 Group:          Applications/Editors
-License:        GPL
+License:        GPLv2+
 URL:            http://www.lichteblau.com/ldapvi/
 Source0:        http://www.lichteblau.com/download/ldapvi-%{version}.tar.gz
 Patch0:         GNUmakefile.in.patch
+Patch1:         %{name}-1.7-getline.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openldap-devel, ncurses-devel, readline-devel, pkgconfig
-BuildRequires:  popt, 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
@@ -21,7 +26,8 @@ it as vipw(1) for LDAP.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p0 -b .gnumk
+%patch1 -p2 -b .getline
 
 
 %build
@@ -49,5 +55,33 @@ 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
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.7-7
+- rebuild with new openssl
+
+* Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7-6
+- fix license tag
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.7-5
+- Autorebuild for GCC 4.3
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.7-4
+ - Rebuild for deps
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.7-3
+- Build Require popt-devel instead of popt.
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.7-2
+- Rebuild for selinux ppc32 issue.
+
 * Thu Jul 05 2007 Gavin Henry <ghenry at suretecsystems.com> - 1.7-1
 - Initial version