rpms/gnucash/FC-5 .cvsignore, 1.12.2.7, 1.12.2.8 gnucash.spec, 1.18.2.17, 1.18.2.18 sources, 1.12.2.7, 1.12.2.8

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/gnucash/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26293

Modified Files:
      Tag: gnucash-g2-branch
	.cvsignore gnucash.spec sources 
Log Message:
update to 2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/.cvsignore,v
retrieving revision 1.12.2.7
retrieving revision 1.12.2.8
diff -u -r1.12.2.7 -r1.12.2.8
--- .cvsignore	18 May 2006 06:11:25 -0000	1.12.2.7
+++ .cvsignore	13 Jul 2006 03:21:19 -0000	1.12.2.8
@@ -1,4 +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-2.0.0.tar.gz
+gnucash-docs-2.0.0.tar.gz


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/gnucash.spec,v
retrieving revision 1.18.2.17
retrieving revision 1.18.2.18
diff -u -r1.18.2.17 -r1.18.2.18
--- gnucash.spec	18 May 2006 06:11:25 -0000	1.18.2.17
+++ gnucash.spec	13 Jul 2006 03:21:19 -0000	1.18.2.18
@@ -1,14 +1,15 @@
-%define svnrev 14125
+%define svnrev 14285
 
 %define buildsvn 0
+%define docver 2.0.0
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 1.9.6
+Version: 2.0.0
 %if %{buildsvn}
-Release: 0.svn%{svnrev}.1
+Release: 2.%{svnrev}svn.1
 %else
-Release: 0
+Release: 1.fc5
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -17,12 +18,12 @@
 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
 Patch5: gnucash-1.8.12-aq.patch
+Patch7: gnucash-1.9.5-guile18.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: g-wrap-devel >= 1.3.2, gtkhtml3-devel
 BuildRequires: libgsf-devel >= 1.12.2
@@ -30,6 +31,7 @@
 BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0
 BuildRequires: libofx-devel, aqbanking-devel, docbook-style-xsl
 BuildRequires: desktop-file-utils, scrollkeeper, texinfo, libtool-ltdl-devel
+BuildRequires: gettext, slib >= 3a1-5, libtool
 Requires: slib >= 3a1-5
 # hack
 Requires: perl(Date::Manip)
@@ -66,8 +68,12 @@
 
 make LIBTOOL=/usr/bin/libtool CC=gcc
 
+%if %{buildsvn}
 cd gnucash-docs
 ./autogen.sh --prefix=/usr
+%else
+cd gnucash-docs-%{docver}
+%endif
 %configure
 make
 
@@ -78,7 +84,12 @@
 
 %find_lang %{name}
 
+%if %{buildsvn}
 cd gnucash-docs
+%else
+cd gnucash-docs-%{docver}
+%endif
+
 make install DESTDIR=$RPM_BUILD_ROOT || :
 
 # vfolder desktop file install stuff
@@ -121,7 +132,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,755)
 %{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/gnucash
+%dir %{_sysconfdir}/gnucash
 %{_bindir}/*
 %{_libexecdir}/gnucash
 %{_libdir}/*
@@ -129,16 +140,31 @@
 %{_datadir}/xml/*
 %{_datadir}/gnucash
 %{_datadir}/gnome/help/gnucash
-%{_datadir}/mime-info/gnucash.*
+#%{_datadir}/mime-info/gnucash.*
 %{_datadir}/omf/gnucash-docs
 %{_datadir}/applications/*
+%{_datadir}/pixmaps/*
 %{_mandir}/man*/*
-%config %{_sysconfdir}/gnucash
+%config %{_sysconfdir}/gnucash/*
 %doc AUTHORS COPYING ChangeLog* HACKING NEWS README README.patches
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
-* Wed May 17 2006 Bill Nottingham <notting at redhat.com> - 1.9.6-0
+* Mon Jul 10 2006 Bill Nottingham <notting at redhat.com> - 2.0.0-1.fc5
+- update to 2.0.0. Woo.
+
+* Mon Jun 19 2006 Bill Nottingham <notting at redhat.com> - 1.9.8-1
+- update to 1.9.8
+
+* Tue Jun  6 2006 Bill Nottingham <notting at 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 at redhat.com> - 1.9.6-2
+- update docs to latest svn (gets rid of extraneous configure check
+  for db185)
+
+* Wed May 17 2006 Bill Nottingham <notting at redhat.com> - 1.9.6-1
 - update to 1.9.6
 
 * Tue May  9 2006 Bill Nottingham <notting at redhat.com> - 1.9.5-3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/sources,v
retrieving revision 1.12.2.7
retrieving revision 1.12.2.8
diff -u -r1.12.2.7 -r1.12.2.8
--- sources	18 May 2006 06:11:25 -0000	1.12.2.7
+++ sources	13 Jul 2006 03:21:19 -0000	1.12.2.8
@@ -1,2 +1,2 @@
-ba5164c17c4c6550f8fa00b2d926c1ad  gnucash-1.9.6.tar.gz
-1d3ddeb14860c8af3d4d9316ba80339f  gnucash-docs-1.9.6.svn14125.tar.bz2
+d5802c398825500ec322bb2b3229aadd  gnucash-2.0.0.tar.gz
+9a84f681330aa61ea1aa7448b87e86a4  gnucash-docs-2.0.0.tar.gz