diff --git a/gnucash.spec b/gnucash.spec index c203fda..045e472 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -8,7 +8,7 @@ Version: 1.9.3 %if %{buildsvn} Release: 1.svn%{svnrev}.1 %else -Release: 1 +Release: 2 %endif License: GPL/GFDL Group: Applications/Productivity @@ -23,6 +23,7 @@ Source1: gnucash-docs-%{version}.svn%{svnrev}.tar.bz2 Patch3: gnucash-1.8.11-icon.patch Patch4: gnucash-1.8.6-64bit-fixes.patch Patch5: gnucash-1.8.12-aq.patch +Patch6: qof.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: g-wrap-devel >= 1.3.2, gtkhtml3-devel BuildRequires: libgsf-devel >= 1.12.2 @@ -52,6 +53,7 @@ balanced books. #%patch3 -p1 -b .icon %patch4 -p1 -b .64bit #%patch5 -p1 -b .aq +%patch6 -p1 -b .qof %build %if %{buildsvn} @@ -136,6 +138,9 @@ done %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Tue Apr 4 2006 Bill Nottingham - 1.9.3-2 +- fix conflict with qof (#187267) + * Mon Mar 27 2006 Bill Nottingham - 1.9.3-1 - update to 1.9.x