From f18ce2e6a544638e9098fdf486f34ae894bbb6fc Mon Sep 17 00:00:00 2001
From: erjot <erjot@pld-linux.org>
Date: Sun, 18 Jan 2004 10:16:43 +0000
Subject: [PATCH] - s/Conflicts/Obsoletes/ to allow upgrade from -oss to -alsa
 - remove bcond from patch - rel 4

Changed files:
    esound.spec -> 1.99
---
 esound.spec | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/esound.spec b/esound.spec
index 2696054..49bfbaa 100644
--- a/esound.spec
+++ b/esound.spec
@@ -12,7 +12,7 @@ Summary(ru):	
 Summary(uk):	óÅÒ×ÅÒ, ÝÏ ÄÏÚ×ÏÌѤ ͦËÛÉÒÕ×ÁÔÉ ×É×¦Ä ÎÁ Ú×ÕËÏ×ÉÊ ÐÒÉÓÔÒ¦Ê
 Name:		esound
 Version:	0.2.32
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL
 Group:		Daemons
@@ -21,7 +21,7 @@ Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.t
 Patch0:		%{name}-am.patch
 Patch1:		%{name}-etc_dir.patch
 Patch2:		%{name}-am18.patch
-%{?with_alsa:Patch3:	%{name}-alsa-pcm-newapi.patch }
+Patch3:		%{name}-alsa-pcm-newapi.patch
 URL:		http://www.tux.org/~ricdude/EsounD.html
 %{?with_alsa:BuildRequires:	alsa-lib-devel >= 1.0.0-pre1 }
 BuildRequires:	audiofile-devel >= 0.2.0
@@ -146,8 +146,8 @@ Group:		Libraries
 Requires(post):	/sbin/ldconfig
 Requires(post):	fileutils
 Requires:	%{name} = %{epoch}:%{version}
-Provides:	esound-driver
-Conflicts:	esound-alsa
+Obsoletes:	%{name}-alsa
+Provides:	%{name}-driver
 
 %description oss
 EsounD OSS driver.
@@ -162,8 +162,9 @@ Group:		Libraries
 Requires(post):	/sbin/ldconfig
 Requires(post):	fileutils
 Requires:	%{name} = %{epoch}:%{version}
-Provides:	esound-driver
-Conflicts:	esound-oss
+Obsoletes:	%{name}-oss
+Provides:	%{name}-driver
+
 
 %description alsa
 EsounD ALSA driver.
-- 
2.44.0