rpms/wv2/F-8 wv2-fixmultilib.patch,NONE,1.1 wv2.spec,1.10,1.11

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/pkgs/rpms/wv2/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20432/F-8

Modified Files:
	wv2.spec 
Added Files:
	wv2-fixmultilib.patch 
Log Message:
- fix #343451 multilib


wv2-fixmultilib.patch:

--- NEW FILE wv2-fixmultilib.patch ---
--- wv2-config.in.orig	2008-01-04 00:28:42.000000000 +0100
+++ wv2-config.in	2008-01-04 00:30:43.000000000 +0100
@@ -87,7 +87,6 @@
 fi
 
 if test "$echo_libs" = "yes"; then
-	libdirs=-L at libdir@
 	my_wv2_libs=
 	for i in $wv2_libs ; do
 		if test "x$i" != "x-L at libdir@" ; then
@@ -99,5 +98,5 @@
 		fi
 	done
 
-	echo $libdirs $my_wv2_libs
+	echo $my_wv2_libs
 fi      


Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/F-8/wv2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wv2.spec	23 Aug 2007 06:18:09 -0000	1.10
+++ wv2.spec	3 Jan 2008 23:35:39 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           wv2
 Version:        0.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A library which allows access to Microsoft® Word files
 
 Group:          System Environment/Libraries
@@ -11,6 +11,8 @@
 Patch1:         wv2-0.2.2-no-undefined.patch
 # see bug #192291
 Patch2:         wv2-0.2.2-no-extra-libs.patch
+# see bug #343451 
+Patch3:         wv2-fixmultilib.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,7 +46,7 @@
 
 %patch1 -p1 -b .no-undefined
 %patch2 -p1 -b .extra_libs
-
+%patch3
 ./autogen.sh
 
 %build
@@ -58,6 +60,8 @@
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
+touch -r ChangeLog $RPM_BUILD_ROOT/%{_bindir}/wv2-config
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,6 +82,9 @@
 %{_includedir}/wv2
 
 %changelog
+* Fri Jan 04 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.3-4
+- fix #343451 multiarch
+
 * Thu Aug 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.3-3
 - new license tag
 - rebuild for buildid