rpms/coda/devel coda.spec,1.10,1.11

[Neil Horman]

Author: nhorman

Update of /cvs/extras/rpms/coda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2367

Modified Files:
	coda.spec 
Log Message:
Resolves: bz 492935



Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/devel/coda.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- coda.spec	27 Feb 2009 20:37:32 -0000	1.10
+++ coda.spec	31 Mar 2009 10:56:47 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           coda
 Version:        6.9.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -127,6 +127,8 @@
 # for %%ghost
 touch $RPM_BUILD_ROOT%{_sysconfdir}/coda/{venus,server}.conf
 
+#remove parser, it conflicts with grib_api
+rm -f $RPM_BUILD_ROOT%{_bindir}/parser
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -185,7 +187,6 @@
 /usr/bin/hoard
 /usr/bin/mkcodabf
 /usr/bin/mklka
-/usr/bin/parser
 /usr/bin/removeinc
 /usr/bin/repair
 /usr/bin/coda_replay
@@ -302,6 +303,9 @@
 
 
 %changelog
+* Tue Mar 31 2009 Neil Horman <nhorman at redhat.com> - 6.9.4-2
+- Remove parser from coda-client, due to name conflict (bz 492953)
+
 * Fri Feb 27 2009 Adam Goode <adam at spicenitz.org> - 6.9.4-1
 - New upstream release
   + Avoid possible crashes and/or data loss when volumes are removed