rpms/NetworkManager/FC-5 NetworkManager.spec,1.109,1.110

[fedora-cvs-commits at redhat.com]

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26409

Modified Files:
	NetworkManager.spec 
Log Message:
* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
- Fix FC-5 buildreqs



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- NetworkManager.spec	30 Aug 2006 15:05:00 -0000	1.109
+++ NetworkManager.spec	30 Aug 2006 15:41:41 -0000	1.110
@@ -3,13 +3,21 @@
 %define hal_version	0.5.0
 
 %if "%fedora" == "5"
-%define dbus_version 0.61
-%define dbus_glib_version 0.61
+%define fc6_or_later 0
+%endif
+%if "%fedora" >= "6"
+%define fc6_or_later 1
+%endif
+%if "%rhel" >= "5"
+%define fc6_or_later 1
 %endif
 
-%if "%fedora" == "6"
+%if %{fc6_or_later}
 %define dbus_version	0.90
 %define dbus_glib_version 0.70
+%else
+%define dbus_version 0.61
+%define dbus_glib_version 0.61
 %endif
 
 %define gtk2_version	2.6.0
@@ -19,7 +27,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -40,9 +48,14 @@
 Requires: wpa_supplicant
 
 BuildRequires: dbus-devel >= %{dbus_version}
+%if %{fc6_or_later}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
+%else
+BuildRequires: wireless-tools >= %{wireless_tools_version}
+BuildRequires: dbus-glib >= %{dbus_glib_version}
+%endif
+BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: glib2-devel gtk2-devel
 BuildRequires: libglade2-devel
 BuildRequires: openssl-devel
@@ -227,6 +240,9 @@
 
 
 %changelog
+* Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
+- Fix FC-5 buildreqs
+
 * Wed Aug 30 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
 - Revert FC6 to latest stable NM
 - Update to stable snapshot