rpms/gnucash/EL-5 gnucash-quiet.patch, NONE, 1.1 branch, 1.1, 1.2 gnucash.spec, 1.76, 1.77

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/gnucash/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19005

Modified Files:
	branch gnucash.spec 
Added Files:
	gnucash-quiet.patch 
Log Message:
sync

gnucash-quiet.patch:

--- NEW FILE gnucash-quiet.patch ---
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


Index: branch
===================================================================
RCS file: /cvs/extras/rpms/gnucash/EL-5/branch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- branch	9 Jun 2007 03:53:38 -0000	1.1
+++ branch	26 Nov 2007 21:21:21 -0000	1.2
@@ -1 +1 @@
-EL-5
+F-8


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/EL-5/gnucash.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gnucash.spec	30 Aug 2007 02:14:34 -0000	1.76
+++ gnucash.spec	26 Nov 2007 21:21:21 -0000	1.77
@@ -4,7 +4,7 @@
 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: 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 @@
 
 %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 @@
 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 @@
 	$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 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Thu Oct 25 2007 Bill Nottingham <notting at redhat.com> - 2.2.1-4
+- multilib fixes (#341331, #357161, #246382)
+
+* Wed Oct 10 2007 Bill Nottingham <notting at redhat.com> - 2.2.1-3
+- silence binreloc warning
+
 * Wed Aug 29 2007 Bill Nottingham <notting at redhat.com> - 2.2.1-2
 - fix build