From e64e7e27665df14d6fdf07368214a063eba52c93 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Jun 06 2006 19:29:00 +0000
Subject: update to 1.9.7


---

diff --git a/.cvsignore b/.cvsignore
index 9ff25a1..cb4b522 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,2 @@
-gnucash-1.9.5.tar.gz
-gnucash-docs-1.9.5.svn13798.tar.bz2
-gnucash-1.9.6.tar.gz
-gnucash-docs-1.9.6.svn14125.tar.bz2
-gnucash-docs-1.9.6.svn14197.tar.bz2
+gnucash-1.9.7.tar.gz
+gnucash-docs-1.9.0.tar.gz
diff --git a/gnucash.spec b/gnucash.spec
index 06fda31..07623ec 100644
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -1,14 +1,15 @@
-%define svnrev 14197
+%define svnrev 14285
 
 %define buildsvn 0
+%define docver 1.9.0
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 1.9.6
+Version: 1.9.7
 %if %{buildsvn}
-Release: 2.svn%{svnrev}.1
+Release: 1.svn%{svnrev}.1
 %else
-Release: 2
+Release: 1
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -17,8 +18,7 @@ Source: gnucash-%{version}.svn%{svnrev}.tar.bz2
 Source1: gnucash-docs-%{version}.svn%{svnrev}.tar.bz2
 %else
 Source: http://www.gnucash.org/pub/gnucash/sources/unstable/1.9.x/gnucash-%{version}.tar.gz
-#Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/gnucash-docs-%{docver}.tar.gz
-Source1: gnucash-docs-%{version}.svn%{svnrev}.tar.bz2
+Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/gnucash-docs-%{docver}.tar.gz
 %endif
 Patch3: gnucash-1.8.11-icon.patch
 Patch4: gnucash-1.8.6-64bit-fixes.patch
@@ -56,7 +56,7 @@ balanced books.
 #%patch3 -p1 -b .icon
 %patch4 -p1 -b .64bit
 #%patch5 -p1 -b .aq
-%patch7 -p1 -b .guile
+#%patch7 -p1 -b .guile
 
 %build
 %if %{buildsvn}
@@ -69,8 +69,12 @@ balanced books.
 
 make LIBTOOL=/usr/bin/libtool CC=gcc
 
+%if %{buildsvn}
 cd gnucash-docs
 ./autogen.sh --prefix=/usr
+%else
+cd gnucash-docs-%{docver}
+%endif
 %configure
 make
 
@@ -132,7 +136,7 @@ done
 %{_datadir}/xml/*
 %{_datadir}/gnucash
 %{_datadir}/gnome/help/gnucash
-%{_datadir}/mime-info/gnucash.*
+#%{_datadir}/mime-info/gnucash.*
 %{_datadir}/omf/gnucash-docs
 %{_datadir}/applications/*
 %{_mandir}/man*/*
@@ -141,6 +145,10 @@ done
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Jun  6 2006 Bill Nottingham <notting@redhat.com> - 1.9.7-1
+- update to 1.9.7
+- use official docs tarball, not svn snapshot
+
 * Thu May 25 2006 Bill Nottingham <notting@redhat.com> - 1.9.6-2
 - update docs to latest svn (gets rid of extraneous configure check
   for db185)
diff --git a/sources b/sources
index 16cb10a..cef6553 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ba5164c17c4c6550f8fa00b2d926c1ad  gnucash-1.9.6.tar.gz
-879904c097b1e1d98f40054e88562edc  gnucash-docs-1.9.6.svn14197.tar.bz2
+2f1ee116eedee29a867e90c638564701  gnucash-1.9.7.tar.gz
+d50b193f8a89dcff56cf11c95e838d2e  gnucash-docs-1.9.0.tar.gz