rpms/bazaar/FC-3 .cvsignore, 1.3, 1.4 bazaar.spec, 1.5, 1.6 sources, 1.3, 1.4

[Shahms King (shahms)]

Author: shahms

Update of /cvs/extras/rpms/bazaar/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6912

Modified Files:
	.cvsignore bazaar.spec sources 
Log Message:
update to upstream version, package documentation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bazaar/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Apr 2005 16:22:38 -0000	1.3
+++ .cvsignore	14 Jun 2005 15:58:28 -0000	1.4
@@ -1 +1,2 @@
-bazaar_1.3.2.tar.gz
+bazaar_1.4.1.tar.gz
+bazaar-doc_1.4.tar.gz


Index: bazaar.spec
===================================================================
RCS file: /cvs/extras/rpms/bazaar/FC-3/bazaar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bazaar.spec	20 May 2005 17:45:47 -0000	1.5
+++ bazaar.spec	14 Jun 2005 15:58:28 -0000	1.6
@@ -1,14 +1,14 @@
 Name:       bazaar
-Version:    1.3.2
+Version:    1.4.1
 Summary:    A distributed revision control system
-Release:    5%{?dist}
+Release:    1%{?dist}
 License:    GPL
 Group:      Development/Tools
 Source:     http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz
-Patch0:     tla-1.3.1-gcc4.patch
+Source1:    http://bazaar.canonical.com/releases/src/bazaar-doc_1.4.tar.gz
 URL:        http://bazaar.canonical.com/
 
-BuildRequires: neon-devel which gettext gpgme-devel perl
+BuildRequires: neon-devel which gettext gpgme-devel python-docutils tetex-latex
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -22,10 +22,11 @@
 on branches.  It can be a replacement for CVS and corrects many
 mis-features of that system.
 
-
 %prep
-%setup -q -n thelove at canonical.com---dists--bazaar--1.3
-%patch0 -p1
+# unpack the source
+%setup -q -n thelove at canonical.com---dists--bazaar--1.4
+# unpack the documentation
+%setup -q -n thelove at canonical.com---dists--bazaar--1.4 -D -T -a 1
 
 %build
 mkdir build
@@ -35,12 +36,20 @@
 ../src/configure --prefix=%{_prefix}
 make
 
+# build the man page
 env PATH="${PWD}/baz/baz:${PATH}" perl ../src/baz-manpage/generate-manpage.pl baz.1
 gzip baz.1
 
 # fix up #! line
 sed 's,^#!.*$,#!/usr/bin/gawk -f,' ../src/baz/=gpg-check.awk > bazaar-gpg-check
 
+# build the rest of the documentation
+cd ../thelove at canonical.com---bazaar-docs--devo--1.4/bazaar-docs
+./bootstrap.sh
+mkdir ../build && cd ../build
+../bazaar-docs/configure --datadir=${PWD}/../../
+make
+
 %install
 rm -rf $RPM_BUILD_ROOT
 cd build
@@ -53,18 +62,27 @@
 
 %find_lang %{name}
 
+# install the documentation
+cd ../thelove at canonical.com---bazaar-docs--devo--1.4/build
+make datadir=${PWD}/../../ install
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f build/%{name}.lang
 %defattr(-, root, root)
-%doc COPYING
+%doc COPYING doc/*
 %{_bindir}/baz
 %{_bindir}/annotate
 %{_bindir}/bazaar-gpg-check
 %{_mandir}/*/*
 
 %changelog
+* Mon Jun 13 2005 Shahms E. King <shahms at shahms.com> 1.4.1-1
+- Update to 1.4.1
+- Build and include extra documentation
+- Remove upstreamed gcc4 patch
+
 * Fri May 20 2005 Shahms E. King <shahms at shahms.com> 1.3.2-5
 - Build man page
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bazaar/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Apr 2005 16:22:38 -0000	1.3
+++ sources	14 Jun 2005 15:58:28 -0000	1.4
@@ -1 +1,2 @@
-e2cbcccc3867d7360fb671c144bf4e6a  bazaar_1.3.2.tar.gz
+56133f5841289f615a5d6167facb915f  bazaar_1.4.1.tar.gz
+b88c0aa3c16370bcc75299d8f56bf38a  bazaar-doc_1.4.tar.gz