rpms/ovaldi/F-7 ovaldi.spec,1.1,1.2

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/ovaldi/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28436

Modified Files:
	ovaldi.spec 
Log Message:
Fix build for Fedora 7



Index: ovaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/F-7/ovaldi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ovaldi.spec	28 Nov 2007 20:25:48 -0000	1.1
+++ ovaldi.spec	29 Nov 2007 13:00:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ovaldi
 Version:        5.3
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Reference implementation of the OVAL interpreter
 
 Group:          Applications/System
@@ -11,8 +11,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcre-devel xerces-c-devel xalan-c-devel rpm-devel
-# rpm-devel should pull in popt-devel. This is fixed in Fedora 9
+%if "%{fedora}" == "8"
+# In Fedora 7 popt is enough, in Fedora 9 rpm-devel pulls this in.
+# This hacks around Fedora 8
 BuildRequires:  popt-devel
+%endif
 
 %description
 The OVAL Interpreter is a freely available reference implementation created
@@ -60,5 +63,8 @@
 
 %changelog
 
+* Thu Nov 29 2007 Lubomir Kundrak <lkundrak at redhat.com> 5.3-1.1
+- popt-devel does not exist in f7 and is unneeded in f9. Drop it.
+
 * Mon Nov 19 2007 Lubomir Kundrak <lkundrak at redhat.com> 5.3-1
 - Initial package