From 18f94e1c47301ec9d735805c39111a55fc70dd99 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Fri, 11 Nov 2005 21:27:53 +0000
Subject: [PATCH] auto-import libXScrnSaver-0.99.2-4 on branch devel from    
 libXScrnSaver-0.99.2-4.src.rpm

---
 libXScrnSaver.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libXScrnSaver.spec b/libXScrnSaver.spec
index f06ae41..30ee9ac 100644
--- a/libXScrnSaver.spec
+++ b/libXScrnSaver.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXss runtime library
 Name: libXScrnSaver
 Version: 0.99.2
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -13,7 +13,7 @@ BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXss runtime library
@@ -23,7 +23,7 @@ Summary: X.Org X11 libXScrnSaver development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Conflicts: XFree86-devel, xorg-x11-devel
+Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXss development package
@@ -76,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3x/*.3x*
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-4
+- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
+- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
+
+
 * Wed Nov 2 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-3
 - Actually spell RPM_OPT_FLAGS correctly this time.