rpms/xmms/devel xmms.spec,1.5,1.6

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5507

Modified Files:
	xmms.spec 
Log Message:

put back conflict, conditional, though.



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms.spec	6 Apr 2005 05:59:52 -0000	1.5
+++ xmms.spec	6 Apr 2005 19:06:59 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: A media player for X which resembles Winamp.
 Name: xmms
 Version: 1.2.10
-Release: 13
+Release: 14
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -33,7 +33,7 @@
 Requires: redhat-menus >= 0.11
 
 %if %{arts_plugin}
-Requires: arts >= 1.3.0
+Conflicts: arts < 1.2.0-1.5
 %endif
 
 BuildRequires: arts-devel >= 1.0.1 gtk+-devel esound-devel mikmod-devel
@@ -199,6 +199,9 @@
 %{_datadir}/xmms/Skins
 
 %changelog
+* Wed Apr  6 2005 Seth Vidal <skvidal at phy.duke.edu> 1:1.2.10-14
+- put back conflict
+
 * Wed Apr  6 2005 Seth Vidal <skvidal at phy.duke.edu> 1:1.2.10-13
 - clean up spec file a bit.
 - remove everything except for the last 2 yrs of changelog entries.