diff --git a/gnucash-quiet.patch b/gnucash-quiet.patch new file mode 100644 index 0000000..61c2351 --- /dev/null +++ b/gnucash-quiet.patch @@ -0,0 +1,12 @@ +diff -up gnucash-2.2.1/src/bin/gnucash-bin.c.foo gnucash-2.2.1/src/bin/gnucash-bin.c +--- gnucash-2.2.1/src/bin/gnucash-bin.c.foo 2007-10-10 12:40:34.000000000 -0400 ++++ gnucash-2.2.1/src/bin/gnucash-bin.c 2007-10-10 12:40:57.000000000 -0400 +@@ -568,8 +568,6 @@ main(int argc, char ** argv) + g_error_free(binreloc_error); + } + } +-#else +- g_message("main: binreloc relocation support was disabled at configure time.\n"); + #endif + + #ifdef HAVE_GETTEXT diff --git a/gnucash.spec b/gnucash.spec index 9ba9ddc..4dbe682 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -4,7 +4,7 @@ Name: gnucash Summary: GnuCash is an application to keep track of your finances Version: 2.2.1 URL: http://gnucash.org/ -Release: 2%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2 @@ -15,6 +15,7 @@ BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0 BuildRequires: libofx-devel, aqbanking-devel, guile-devel BuildRequires: desktop-file-utils, texinfo BuildRequires: gettext, slib >= 3a1-5, libtool, intltool +Patch: gnucash-quiet.patch Requires: gnucash-docs >= 2.2.0 Requires: slib >= 3a1-5 Requires: perl(Finance::Quote) @@ -35,6 +36,8 @@ balanced books. %prep %setup -q +%patch -p1 +find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \; %build chmod 644 src/import-export/import-commodity-matcher.c @@ -65,6 +68,8 @@ desktop-file-install --vendor gnome --delete-original \ echo "StartupWMClass=GnuCash" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnucash.desktop sed -is 's|Icon=gnucash-icon|Icon=gnucash-icon-48x48|g' $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnucash.desktop +mv $RPM_BUILD_ROOT/%{_libdir}/lib* $RPM_BUILD_ROOT/%{_libdir}/gnucash + rm -rf $RPM_BUILD_ROOT/%{_infodir} \ $RPM_BUILD_ROOT/%{_includedir} \ $RPM_BUILD_ROOT/%{_datadir}/aclocal \ @@ -74,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir} \ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig \ $RPM_BUILD_ROOT/%{_bindir}/gnucash-config -find $RPM_BUILD_ROOT/%{_libdir} -name *.so -a -type l -exec rm -f {} \; +find $RPM_BUILD_ROOT/%{_libdir} -name *.la -exec rm -f {} \; %clean rm -rf $RPM_BUILD_ROOT @@ -118,6 +123,12 @@ fi %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Thu Oct 25 2007 Bill Nottingham - 2.2.1-4 +- multilib fixes (#341331, #357161, #246382) + +* Wed Oct 10 2007 Bill Nottingham - 2.2.1-3 +- silence binreloc warning + * Wed Aug 29 2007 Bill Nottingham - 2.2.1-2 - fix build