rpms/gnucash/F-8 gnucash.spec,1.80,1.81

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/gnucash/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18435/F-8

Modified Files:
	gnucash.spec 
Log Message:
fix gnucash multilib



Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/F-8/gnucash.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gnucash.spec	10 Oct 2007 16:49:30 -0000	1.80
+++ gnucash.spec	29 Oct 2007 20:55:19 -0000	1.81
@@ -4,7 +4,7 @@
 Summary: GnuCash is an application to keep track of your finances
 Version: 2.2.1
 URL: http://gnucash.org/
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2
@@ -37,6 +37,7 @@
 %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
@@ -67,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 \
@@ -76,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
@@ -120,6 +123,9 @@
 %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