dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-wv2-0.4.0.tar.bz2

.gitignore

@@ -0,0 +1 @@
+wv2-0.2.3.tar.bz2

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)

sources

@@ -1 +1 @@
-e0acd7a551c898aab3fb6afafc606bb4  wv2-0.4.0.tar.bz2
+ea7e3331fbe597185070c0784411a3f7  wv2-0.2.3.tar.bz2

wv2-0.2.2-no-extra-libs.patch

@@ -0,0 +1,11 @@
+--- wv2-0.2.2/wv2-config.in.extra_libs	2006-02-21 11:36:20.000000000 -0600
++++ wv2-0.2.2/wv2-config.in	2004-05-09 13:23:15.000000000 -0500
+@@ -76,7 +76,7 @@
+ 	echo $exec_prefix
+ fi
+ 
+-wv2_libs="-lwv2 @WV_LDFLAGS@"
++wv2_libs="-lwv2"
+ 
+ if test "$echo_cflags" = "yes"; then
+ 	includes="@WV_CFLAGS@"

wv2-0.2.2-no-undefined.patch

@@ -0,0 +1,11 @@
+--- wv2-0.2.2/src/Makefile.am.no-undefined	2004-05-09 13:23:16.000000000 -0500
++++ wv2-0.2.2/src/Makefile.am	2006-02-21 12:02:08.000000000 -0600
+@@ -16,7 +16,7 @@
+ 
+ libwv2_la_LDFLAGS = \
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+-	-export-dynamic
++	-export-dynamic -no-undefined -Wl,--no-undefined
+ 
+ libwv2_la_SOURCES = olestorage.cpp olestream.cpp \
+ 	word97_generated.cpp word97_helper.cpp word95_helper.cpp \

wv2-0.4.0-LIB_SUFFIX.patch

@@ -1,25 +0,0 @@
-diff -up wv2-0.4.0/src/CMakeLists.txt.LIB_SUFFIX wv2-0.4.0/src/CMakeLists.txt
---- wv2-0.4.0/src/CMakeLists.txt.LIB_SUFFIX	2009-08-26 16:46:40.000000000 -0500
-+++ wv2-0.4.0/src/CMakeLists.txt	2009-09-11 09:26:27.942622901 -0500
-@@ -90,11 +90,11 @@ ENDIF( WIN32 )
- INSTALL( TARGETS wv2
-     EXPORT wvWare
-     RUNTIME DESTINATION bin
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib/static
-+    LIBRARY DESTINATION lib${LIB_SUFFIX}
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/static
- )
- 
--INSTALL( EXPORT wvWare DESTINATION lib/wvWare FILE wv2.cmake )
-+INSTALL( EXPORT wvWare DESTINATION lib${LIB_SUFFIX}/wvWare FILE wv2.cmake )
- 
- INSTALL( FILES ${wv2_HEADERS}
-   DESTINATION include/wv2
-@@ -103,5 +103,5 @@ INSTALL( FILES ${wv2_HEADERS}
- # libtool files are useless for Visual C++ and Borland C++
- IF( NOT MSVC AND NOT BORLAND )
-   INCLUDE( ${wvWare_SOURCE_DIR}/cmake/MacroCreateLibtoolFile.cmake )
--  CREATE_LIBTOOL_FILE( wv2 /lib )
-+  CREATE_LIBTOOL_FILE( wv2 /lib${LIB_SUFFIX} )
- ENDIF( NOT MSVC AND NOT BORLAND )

wv2-0.4.0-defines.patch

@@ -1,27 +0,0 @@
-diff -up wv2-0.4.0/src/ustring.cpp.defines wv2-0.4.0/src/ustring.cpp
---- wv2-0.4.0/src/ustring.cpp.defines	2009-08-26 16:46:40.000000000 -0500
-+++ wv2-0.4.0/src/ustring.cpp	2009-09-11 09:18:40.596622813 -0500
-@@ -78,9 +78,9 @@ bool wvWare::isPosInf(double d)
- {
- #if defined(HAVE_FUNC_ISINF)
-   return (isinf(d) == 1);
--#elif HAVE_FUNC_FINITE
-+#elif defined(HAVE_FUNC_FINITE)
-   return finite(d) == 0 && d == d; // ### can we distinguish between + and - ?
--#elif HAVE_FUNC__FINITE
-+#elif defined(HAVE_FUNC__FINITE)
-   return _finite(d) == 0 && d == d; // ###
- #else
-   return false;
-@@ -91,9 +91,9 @@ bool wvWare::isNegInf(double d)
- {
- #if defined(HAVE_FUNC_ISINF)
-   return (isinf(d) == -1);
--#elif HAVE_FUNC_FINITE
-+#elif defined(HAVE_FUNC_FINITE)
-   return finite(d) == 0 && d == d; // ###
--#elif HAVE_FUNC__FINITE
-+#elif defined(HAVE_FUNC__FINITE)
-   return _finite(d) == 0 && d == d; // ###
- #else
-   return false;

wv2-0.4.0-extra_libs.patch

@@ -1,12 +0,0 @@
-diff -up wv2-0.4.0/wv2-config.cmake.extra_libs wv2-0.4.0/wv2-config.cmake
---- wv2-0.4.0/wv2-config.cmake.extra_libs	2009-08-26 16:46:40.000000000 -0500
-+++ wv2-0.4.0/wv2-config.cmake	2009-09-11 09:36:48.155394840 -0500
-@@ -76,7 +76,7 @@ if test "$echo_exec_prefix" = "yes"; the
- 	echo $exec_prefix
- fi
- 
--wv2_libs="@WV2_LDFLAGS@ -lwv2 @WV2_LIBS@"
-+wv2_libs="-lwv2"
- 
- if test "$echo_cflags" = "yes"; then
- 	includes="@WV2_CFLAGS@"

wv2-0.4.0-multilib.patch

@@ -1,18 +0,0 @@
-diff -up wv2-0.4.0/wv2-config.cmake.multilib wv2-0.4.0/wv2-config.cmake
---- wv2-0.4.0/wv2-config.cmake.multilib	2009-09-11 09:38:24.415620835 -0500
-+++ wv2-0.4.0/wv2-config.cmake	2009-09-11 09:43:19.806622445 -0500
-@@ -87,7 +87,6 @@ if test "$echo_cflags" = "yes"; then
- fi
- 
- if test "$echo_libs" = "yes"; then
--	libdirs=-L${exec_prefix}/lib
- 	my_wv2_libs=
- 	for i in $wv2_libs ; do
- 		if test "x$i" != "x-L${exec_prefix}/lib" ; then
-@@ -99,5 +98,5 @@ if test "$echo_libs" = "yes"; then
- 		fi
- 	done
- 
--	echo $libdirs $my_wv2_libs
-+	echo $my_wv2_libs
- fi      

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-gcc43.patch

@@ -0,0 +1,10 @@
+--- src/styles.cpp.orig	2008-02-22 15:40:41.000000000 +0100
++++ src/styles.cpp	2008-02-22 15:41:05.000000000 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include "wvlog.h"
+ #include <algorithm>
++#include <string.h>
+ 
+ namespace wvWare
+ {

wv2.spec

@@ -1,28 +1,31 @@
+
 Name:           wv2
-Version:        0.4.0
-Release:        1%{?dist}
+Epoch:          1
+Version:        0.2.3
+Release:        10%{?dist}
 Summary:        A library which allows access to Microsoft® Word files
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://wvware.sourceforge.net
-Source0:        http://download.sourceforge.net/wvware/wv2-%{version}.tar.bz2
+Source0:        http://dl.sf.net/wvware/wv2-0.2.3.tar.bz2
+# see bug #182293
+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
+# fix gcc43 build
+Patch4:         wv2-gcc43.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# see bug #192291
-Patch2: wv2-0.4.0-extra_libs.patch
-# see bug #343451
-Patch3: wv2-0.4.0-multilib.patch
-## upstreamable patches
-Patch50: wv2-0.4.0-defines.patch
-Patch51: wv2-0.4.0-LIB_SUFFIX.patch
-
-BuildRequires: cmake
-BuildRequires: libgsf-devel
-BuildRequires: libxml2-devel
-BuildRequires: pkgconfig
-BuildRequires: glib2-devel
-BuildRequires: zlib-devel
+BuildRequires:  automake libtool
+BuildRequires:  libgsf-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  glib2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig
 
 %description
 wv is a library which allows access to Microsoft® Word files. It can load and
@@ -33,27 +36,25 @@ formats as well: Word 2 docs are converted to plaintext.
 %package devel
 Summary:        Development tools for programs which will use the wv2 library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       libgsf-devel
 Requires:       glib2-devel
 Requires:       libxml2-devel
+
 %description devel 
 The wv2-devel package includes the header files necessary for developing.
 
-
 %prep
 %setup -q
 
+%patch1 -p1 -b .no-undefined
 %patch2 -p1 -b .extra_libs
-%patch3 -p1 -b .multilib
-%patch50 -p1 -b .defines
-%patch51 -p1 -b .LIB_SUFFIX
-
+%patch3
+./autogen.sh
+%patch4
 
 %build
-
-%cmake .
-
+%configure --disable-warnings --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -61,47 +62,33 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-
-
-%check
-# checks currently fail on ppc64, appears to be a toolchain prob
-%ifarch ppc64
-make -k test ||: 
-%else
-make -k test
-%endif
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
+touch -r ChangeLog $RPM_BUILD_ROOT/%{_bindir}/wv2-config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig 
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO
-%{_libdir}/libwv2.so.3*
-%dir %{_libdir}/wvWare/
+%{_libdir}/libwv2.so.1*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
 %{_bindir}/wv2-config
 %{_libdir}/libwv2.so
-%{_libdir}/wvWare/wv2-noconfig.cmake
-%{_libdir}/wvWare/wv2.cmake
 %{_includedir}/wv2/
 
-
 %changelog
-* Fri Sep 11 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.4.0-1
-- wv2-0.4.0
+* Tue Sep 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 1:0.2.3-10
+- Epoch: 1
+- tighten %%files
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild