From cb1493cf85b78f35361331e4919a4ea3d703c57d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:19:32 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for wv2 --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From d192088ce5077496d4c7ffbee158a17c3a48f9e0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 29 Sep 2009 19:17:06 +0000 Subject: [PATCH 2/5] - Epoch: 1 - tighten %files --- .cvsignore | 2 +- sources | 2 +- wv2-0.2.2-no-extra-libs.patch | 11 +++++ wv2-0.2.2-no-undefined.patch | 11 +++++ wv2-0.4.0-LIB_SUFFIX.patch | 25 ----------- wv2-0.4.0-defines.patch | 27 ------------ wv2-0.4.0-extra_libs.patch | 12 ----- wv2-0.4.0-multilib.patch | 18 -------- wv2-fixmultilib.patch | 17 ++++++++ wv2-gcc43.patch | 10 +++++ wv2.spec | 82 ++++++++++++++--------------------- 11 files changed, 84 insertions(+), 133 deletions(-) create mode 100644 wv2-0.2.2-no-extra-libs.patch create mode 100644 wv2-0.2.2-no-undefined.patch delete mode 100644 wv2-0.4.0-LIB_SUFFIX.patch delete mode 100644 wv2-0.4.0-defines.patch delete mode 100644 wv2-0.4.0-extra_libs.patch delete mode 100644 wv2-0.4.0-multilib.patch create mode 100644 wv2-fixmultilib.patch create mode 100644 wv2-gcc43.patch diff --git a/.cvsignore b/.cvsignore index 1d6fb67..2eff2f8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wv2-0.4.0.tar.bz2 +wv2-0.2.3.tar.bz2 diff --git a/sources b/sources index 8c25308..84a4b19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0acd7a551c898aab3fb6afafc606bb4 wv2-0.4.0.tar.bz2 +ea7e3331fbe597185070c0784411a3f7 wv2-0.2.3.tar.bz2 diff --git a/wv2-0.2.2-no-extra-libs.patch b/wv2-0.2.2-no-extra-libs.patch new file mode 100644 index 0000000..1c831f1 --- /dev/null +++ b/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@" diff --git a/wv2-0.2.2-no-undefined.patch b/wv2-0.2.2-no-undefined.patch new file mode 100644 index 0000000..5831227 --- /dev/null +++ b/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 \ diff --git a/wv2-0.4.0-LIB_SUFFIX.patch b/wv2-0.4.0-LIB_SUFFIX.patch deleted file mode 100644 index ca528ce..0000000 --- a/wv2-0.4.0-LIB_SUFFIX.patch +++ /dev/null @@ -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 ) diff --git a/wv2-0.4.0-defines.patch b/wv2-0.4.0-defines.patch deleted file mode 100644 index 30af243..0000000 --- a/wv2-0.4.0-defines.patch +++ /dev/null @@ -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; diff --git a/wv2-0.4.0-extra_libs.patch b/wv2-0.4.0-extra_libs.patch deleted file mode 100644 index 112e22b..0000000 --- a/wv2-0.4.0-extra_libs.patch +++ /dev/null @@ -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@" diff --git a/wv2-0.4.0-multilib.patch b/wv2-0.4.0-multilib.patch deleted file mode 100644 index 5c3e05c..0000000 --- a/wv2-0.4.0-multilib.patch +++ /dev/null @@ -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 diff --git a/wv2-fixmultilib.patch b/wv2-fixmultilib.patch new file mode 100644 index 0000000..de1e932 --- /dev/null +++ b/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 diff --git a/wv2-gcc43.patch b/wv2-gcc43.patch new file mode 100644 index 0000000..81578f5 --- /dev/null +++ b/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 ++#include + + namespace wvWare + { diff --git a/wv2.spec b/wv2.spec index bee3050..5f9a2bf 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,28 +1,31 @@ + Name: wv2 -Version: 0.4.0 -Release: 1%{?dist} +Epoch: 1 +Version: 0.2.3 +Release: 9%{?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,50 +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 - 0.4.0-1 -- wv2-0.4.0 - -* Mon Jul 27 2009 Fedora Release Engineering - 0.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Tue Sep 29 2009 Rex Dieter - 1:0.2.3-9 +- Epoch: 1 +- tighten %%files * Wed Feb 25 2009 Fedora Release Engineering - 0.2.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 1766b0655689834f6a5619726a897dd9f24ad083 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 29 Sep 2009 19:18:14 +0000 Subject: [PATCH 3/5] Release++ --- wv2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wv2.spec b/wv2.spec index 5f9a2bf..48a7ed7 100644 --- a/wv2.spec +++ b/wv2.spec @@ -2,7 +2,7 @@ Name: wv2 Epoch: 1 Version: 0.2.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A library which allows access to Microsoft® Word files Group: System Environment/Libraries @@ -86,10 +86,13 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/wv2/ %changelog -* Tue Sep 29 2009 Rex Dieter - 1:0.2.3-9 +* Tue Sep 29 2009 Rex Dieter - 1:0.2.3-10 - Epoch: 1 - tighten %%files +* Mon Jul 27 2009 Fedora Release Engineering - 0.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ef6daf79cfba6555bcf30396e656768bdb9ef0e6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:19:14 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9387543..106a103 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wv2 -# $Id$ +# $Id: Makefile,v 1.1 2005/07/01 22:37:08 awjb Exp $ 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 +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 6ba3e760f526d8c0521ef04d39d54c318f42df32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:27:46 +0000 Subject: [PATCH 5/5] 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 106a103..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wv2 -# $Id: Makefile,v 1.1 2005/07/01 22:37:08 awjb Exp $ -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 $$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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12