From 0249b4e1b4a904789716783461e18e6e3cbc5704 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:10:24 +0000 Subject: [PATCH 1/4] Initialize branch F-7 for wv --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 69f339ab7030825e2c9cdf1598a5b6035ce5ea38 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sun, 30 Mar 2008 22:31:49 +0000 Subject: [PATCH 2/4] Fix libdir in wv's pkgconfig entry --- wv-1.2.4-pkgconfig.patch | 10 ++++++++++ wv.spec | 18 +++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 wv-1.2.4-pkgconfig.patch diff --git a/wv-1.2.4-pkgconfig.patch b/wv-1.2.4-pkgconfig.patch new file mode 100644 index 0000000..d2ab7e7 --- /dev/null +++ b/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 diff --git a/wv.spec b/wv.spec index 5400313..2fe51d3 100644 --- a/wv.spec +++ b/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 - 1.2.4-4 +- fix libdir in wv's pkgconfig entry + +* Mon Feb 18 2008 Fedora Release Engineering - 1.2.4-3 +- Autorebuild for GCC 4.3 + +* Sun Aug 26 2007 Aurelien Bompard 1.2.4-2 +- fix license tag +- rebuild for BuildID + * Sat Oct 28 2006 Aurelien Bompard 1.2.4-1 - update to 1.2.4, fixes #212696 (CVE-2006-4513) From a4d99ca3aeaa41517004a147018deadd025fe085 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:19:21 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6e1d8c7..9b85549 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From d07f50b527815cc82972da9304352c50dbd953be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:27:27 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9b85549..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7