rpms/bazaar/devel bazaar.spec,1.8,1.9

[Shahms King (shahms)]

Author: shahms

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

Modified Files:
	bazaar.spec 
Log Message:
Remove /usr/bin/annotate to fix bug #162665




Index: bazaar.spec
===================================================================
RCS file: /cvs/extras/rpms/bazaar/devel/bazaar.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bazaar.spec	29 Jun 2005 17:06:54 -0000	1.8
+++ bazaar.spec	7 Jul 2005 19:52:04 -0000	1.9
@@ -1,7 +1,7 @@
 Name:       bazaar
 Version:    1.4.2
 Summary:    A distributed revision control system
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPL
 Group:      Development/Tools
 Source:     http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz
@@ -59,6 +59,12 @@
 install -D baz.1 $RPM_BUILD_ROOT%{_mandir}/man1/baz.1
 install -m755 bazaar-gpg-check $RPM_BUILD_ROOT%{_bindir}/bazaar-gpg-check
 
+# The stand alone annotate is meant to debug baz interals, not installation
+# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html
+if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then
+    rm $RPM_BUILD_ROOT%{_bindir}/annotate
+fi
+
 %find_lang %{name}
 
 # install the documentation
@@ -72,11 +78,13 @@
 %defattr(-, root, root)
 %doc COPYING doc/*
 %{_bindir}/baz
-%{_bindir}/annotate
 %{_bindir}/bazaar-gpg-check
 %{_mandir}/*/*
 
 %changelog
+* Thu Jul 07 2005 Shahms E. King <shahms at shahms.com> 1.4.2-2
+- Remove the standalone "annotate" binary to fix bug #162665
+
 * Wed Jun 29 2005 Shahms E. King <shahms at shahms.com> 1.4.2-1
 - Update to 1.4.2
 - Don't explicitly gzip man pages