rpms/qstat/devel qstat.spec,1.1,1.2

[Andy Shevchenko (andriy)]

Author: andriy

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

Modified Files:
	qstat.spec 
Log Message:
Try to fix #201279


Index: qstat.spec
===================================================================
RCS file: /cvs/extras/rpms/qstat/devel/qstat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qstat.spec	1 Aug 2006 08:43:02 -0000	1.1
+++ qstat.spec	10 Aug 2006 12:00:48 -0000	1.2
@@ -1,12 +1,16 @@
 Summary: Real-time Game Server Status for FPS game servers
 Name: qstat
 Version: 2.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Artistic
 Group: Amusements/Games
 URL: http://www.qstat.org/
 Source: http://heanet.dl.sourceforge.net/sourceforge/qstat/qstat-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# The name "qstat" is actually a requirement in POSIX 1003.2d.
+# it has been implemented by many batch queueing systems over the decades.
+# In this case try to handle with the conflicting package(s).
+Conflicts: torque-client
 
 %description
 QStat is a command-line program that gathers real-time statistics
@@ -39,6 +43,9 @@
 %{_bindir}/qstat
 
 %changelog
+* Thu Aug 10 2006 Andy Shevchenko <andriy at asplinux.com.ua> 2.10-5
+- add Conflicts with torque-client (#201279)
+
 * Mon Jul 31 2006 Andy Shevchenko <andriy at asplinux.com.ua> 2.10-4
 - do not pack COMPILE.txt
 - no need Makefile* in the documentation