dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wv2
-# $Id$
-NAME := wv2
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

wv2-fixmultilib.patch

@@ -0,0 +1,17 @@
+--- 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@libdir@
+ 	my_wv2_libs=
+ 	for i in $wv2_libs ; do
+ 		if test "x$i" != "x-L@libdir@" ; then
+@@ -99,5 +98,5 @@
+ 		fi
+ 	done
+ 
+-	echo $libdirs $my_wv2_libs
++	echo $my_wv2_libs
+ fi      

wv2.spec

@@ -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 @@ Source0:        http://dl.sf.net/wvware/wv2-0.2.3.tar.bz2
 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 @@ The wv2-devel package includes the header files necessary for developing.
 
 %patch1 -p1 -b .no-undefined
 %patch2 -p1 -b .extra_libs
-
+%patch3
 ./autogen.sh
 
 %build
@@ -58,6 +60,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 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 @@ rm -rf $RPM_BUILD_ROOT
 %{_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