From 09f4960d8829e470dea30acf8e6331257e3f2ab9 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@fedoraproject.org>
Date: Feb 03 2006 15:06:45 +0000
Subject: require 2.2 instead of conflicting with < 2.2


---

diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index 3f651e1..e5b0433 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -8,14 +8,11 @@ URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.gz
 Patch1: gnome-user-share-httpd-2.2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: httpd
+Requires: httpd >= 2.2.0
 BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
 BuildRequires: desktop-file-utils
 Prereq: GConf2
 
-# Config file format changed for 2.2.0 (patch1)
-Conflicts: httpd < 2.2.0
-
 %description
 gnome-user-share