dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wv
-# $Id$
-NAME := wv
-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)

wv-1.2.4-pkgconfig.patch

@@ -0,0 +1,10 @@
+--- wv-1.2.4/wv-1.0.pc.in.pkgconfig	2005-04-18 17:14:48.000000000 -0400
++++ wv-1.2.4/wv-1.0.pc.in	2008-03-30 17:42:15.000000000 -0400
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include
+ 
+ Name: wvWare

wv.spec

@@ -1,15 +1,16 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
 Version:    1.2.4
-Release:    1%{?dist}
-License:    GPL
+Release:    4%{?dist}
+License:    GPLv2+
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
+Source:     http://dl.sourceforge.net/wvware/wv-%{version}.tar.gz
 #Patch0:     wv-wvtext-tmp.patch
 #Patch1:     wv-1.0.3-oledecod.patch
 #Patch2:     wv-1.0.3-gcc4.patch
 Patch5:     wv-1.0.0-rhbug150461.patch
+Patch6:     wv-1.2.4-pkgconfig.patch
 
 BuildRequires: glib2-devel
 BuildRequires: libjpeg-devel
@@ -45,6 +46,7 @@ This package contains the development files
 #%patch1 -p1 -b .oledecod
 #%patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
+%patch6 -p1 -b .pkgconfig
 
 
 %build
@@ -85,6 +87,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 30 2008 Michel Salim <michel.sylvan@gmail.com> - 1.2.4-4
+- fix libdir in wv's pkgconfig entry
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.2.4-3
+- Autorebuild for GCC 4.3
+
+* Sun Aug 26 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.2.4-2
+- fix license tag
+- rebuild for BuildID
+
 * Sat Oct 28 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.2.4-1
 - update to 1.2.4, fixes #212696 (CVE-2006-4513)