diff --git a/.cvsignore b/.cvsignore index 461b130..20d898c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,10 +1,2 @@ -gnucash-1.8.11.tar.gz -gnucash-docs-1.8.5.tar.gz -gnucash-docs-1.9.0.svn12279.tar.gz -gnucash-1.9.0.svn12279.tar.gz -gnucash-1.9.0.svn12307.tar.bz2 -gnucash-docs-1.9.0.svn12307.tar.bz2 -gnucash-1.9.0.svn12955.tar.bz2 -gnucash-docs-1.9.0.svn12955.tar.bz2 -gnucash-1.9.0.tar.gz -gnucash-docs-1.9.0.svn13195.tar.bz2 +gnucash-docs-1.9.1.svn13331.tar.bz2 +gnucash-1.9.1.tar.gz diff --git a/gnucash.spec b/gnucash.spec index ee6405c..7fb0312 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -1,16 +1,25 @@ -%define svnrev 13195 +%define svnrev 13331 + +%define buildsvn 0 Name: gnucash Summary: GnuCash is an application to keep track of your finances. -Version: 1.9.0 +Version: 1.9.1 +%if %{buildsvn} +Release: 1.svn%{svnrev}.1 +%else Release: 1 -# Release: 1.svn%{svnrev}.1 +%endif License: GPL/GFDL Group: Applications/Productivity -Source: http://www.gnucash.org/pub/gnucash/sources/unstable/1.9.x/%{name}-%{version}.tar.gz -#Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz -#Source: gnucash-%{version}.svn%{svnrev}.tar.bz2 -Source1: gnucash-docs-1.9.0.svn%{svnrev}.tar.bz2 +%if %{buildsvn} +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 +%endif Patch3: gnucash-1.8.11-icon.patch Patch4: gnucash-1.8.6-64bit-fixes.patch Patch5: gnucash-1.8.12-aq.patch @@ -34,13 +43,20 @@ use, but is backed with double-entry accounting principles to ensure balanced books. %prep +%if %{buildsvn} +%setup -q -a 1 -n gnucash +%else %setup -q -a 1 +%endif + #%patch3 -p1 -b .icon %patch4 -p1 -b .64bit #%patch5 -p1 -b .aq %build -#./autogen.sh --prefix=/usr +%if %{buildsvn} +./autogen.sh +%endif %configure --disable-sql --enable-error-on-warning=no \ --enable-ofx \ --enable-hbci \ @@ -70,7 +86,7 @@ desktop-file-install --vendor gnome --delete-original \ --add-category X-Red-Hat-Extra \ --add-category Application \ --add-category Office \ - $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/gnucash.desktop + $RPM_BUILD_ROOT%{_datadir}/applications/gnucash.desktop echo "StartupWMClass=GnuCash" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnucash.desktop rm -rf $RPM_BUILD_ROOT/%{_infodir} \ @@ -120,6 +136,9 @@ done %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Mon Feb 20 2006 Bill Nottingham 1.9.1-1 +- 1.9.1 + * Fri Feb 10 2006 Bill Nottingham 1.9.0-1 - update to official 1.9.0 diff --git a/sources b/sources index 254466c..a276a37 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4b3dd389c9ee007dae1307f1bc2696e0 gnucash-1.9.0.tar.gz -81ee8609a14ac0bd1cf8d601e3a4ae8e gnucash-docs-1.9.0.svn13195.tar.bz2 +0632996dc637dcbf84d085177d72bdd7 gnucash-docs-1.9.1.svn13331.tar.bz2 +fd1ba54948cf6a91faf1328f2051677d gnucash-1.9.1.tar.gz