From 0febe4fb14f7c04d107c9a068d762732a3a9f00f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:10:33 +0000 Subject: [PATCH 01/21] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 359c0ddecb5263df755e08dd636af3743b45db71 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Thu, 23 Aug 2007 06:17:53 +0000 Subject: [PATCH 02/21] - new license tag - rebuild for buildid (devel) --- wv2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wv2.spec b/wv2.spec index 08d15ef..33e5375 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,10 +1,10 @@ Name: wv2 Version: 0.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library which allows access to Microsoft® Word files Group: System Environment/Libraries -License: LGPL +License: LGPLv2 URL: http://wvware.sourceforge.net Source0: http://dl.sf.net/wvware/wv2-0.2.3.tar.bz2 # see bug #182293 @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/wv2 %changelog +* Thu Aug 23 2007 Andreas Bierfert 0.2.3-3 +- new license tag + * Fri Sep 15 2006 Andreas Bierfert 0.2.3-2 - FE6 rebuild - fix BR From 32ebc8abb2d21a32a4e79f01b75a8ff06b4f0764 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Thu, 23 Aug 2007 06:18:09 +0000 Subject: [PATCH 03/21] - new license tag - rebuild for buildid (devel) --- wv2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wv2.spec b/wv2.spec index 08d15ef..90cfc1d 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,10 +1,10 @@ Name: wv2 Version: 0.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library which allows access to Microsoft® Word files Group: System Environment/Libraries -License: LGPL +License: LGPLv2 URL: http://wvware.sourceforge.net Source0: http://dl.sf.net/wvware/wv2-0.2.3.tar.bz2 # see bug #182293 @@ -78,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/wv2 %changelog +* Thu Aug 23 2007 Andreas Bierfert 0.2.3-3 +- new license tag +- rebuild for buildid + * Fri Sep 15 2006 Andreas Bierfert 0.2.3-2 - FE6 rebuild - fix BR From ad0118e266b1ddc63e6b1e01fc7879c667f06a52 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Thu, 3 Jan 2008 23:35:51 +0000 Subject: [PATCH 04/21] - fix #343451 multilib --- wv2-fixmultilib.patch | 17 +++++++++++++++++ wv2.spec | 11 +++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 wv2-fixmultilib.patch 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.spec b/wv2.spec index 90cfc1d..7718a97 100644 --- a/wv2.spec +++ b/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 0.2.3-4 +- fix #343451 multiarch + * Thu Aug 23 2007 Andreas Bierfert 0.2.3-3 - new license tag - rebuild for buildid From 1a69da3dc09ad2a6345abab9015abf455bde1443 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Mon, 11 Feb 2008 16:48:39 +0000 Subject: [PATCH 05/21] automated rebuild --- wv2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wv2.spec b/wv2.spec index 7718a97..58a344c 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A library which allows access to Microsoft® Word files Group: System Environment/Libraries @@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/wv2 %changelog +* Mon Feb 11 2008 Andreas Bierfert - 0.2.3-5 +- Rebuilt for gcc43 + * Fri Jan 04 2008 Andreas Bierfert 0.2.3-4 - fix #343451 multiarch From ca88244a9ddecd3e2e14cec1fae4fc84400579b0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 18 Feb 2008 20:58:40 +0000 Subject: [PATCH 06/21] - Autorebuild for GCC 4.3 --- wv2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wv2.spec b/wv2.spec index 58a344c..b9e133a 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A library which allows access to Microsoft® Word files Group: System Environment/Libraries @@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/wv2 %changelog +* Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-6 +- Autorebuild for GCC 4.3 + * Mon Feb 11 2008 Andreas Bierfert - 0.2.3-5 - Rebuilt for gcc43 From 05803b29faf62b24f4f5fe34b52a0fe472139601 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 22 Feb 2008 14:53:24 +0000 Subject: [PATCH 07/21] - fix gcc43 build (#433999) --- wv2-gcc43.patch | 10 ++++++++++ wv2.spec | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 wv2-gcc43.patch 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 b9e133a..3d2e514 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A library which allows access to Microsoft® Word files Group: System Environment/Libraries @@ -13,6 +13,8 @@ Patch1: wv2-0.2.2-no-undefined.patch 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) @@ -48,6 +50,7 @@ The wv2-devel package includes the header files necessary for developing. %patch2 -p1 -b .extra_libs %patch3 ./autogen.sh +%patch4 %build %configure --disable-warnings --disable-dependency-tracking @@ -82,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/wv2 %changelog +* Fri Feb 22 2008 Andreas Bierfert - 0.2.3-7 +- fix gcc43 build (#433999) + * Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-6 - Autorebuild for GCC 4.3 From 9650fb0c7ef23d331ba527c71a86e65b0fe56775 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 07:23:32 +0000 Subject: [PATCH 08/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- wv2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wv2.spec b/wv2.spec index 3d2e514..3d9f391 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A library which allows access to Microsoft® Word files Group: System Environment/Libraries @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/wv2 %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.2.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Feb 22 2008 Andreas Bierfert - 0.2.3-7 - fix gcc43 build (#433999) From 669800892e072d94d2b3c56e42f95adc995b09ff Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:29:59 +0000 Subject: [PATCH 09/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- wv2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wv2.spec b/wv2.spec index 3d9f391..7cbb8ab 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library which allows access to Microsoft® Word files Group: System Environment/Libraries @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/wv2 %changelog +* 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 d72aafcb0f77b2617cb8ca1d81735f1ed2001db4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Sep 2009 15:56:41 +0000 Subject: [PATCH 10/21] - wv2-0.4.0 --- .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 | 72 ++++++++++++++++++++--------------- 11 files changed, 126 insertions(+), 81 deletions(-) delete mode 100644 wv2-0.2.2-no-extra-libs.patch delete mode 100644 wv2-0.2.2-no-undefined.patch create mode 100644 wv2-0.4.0-LIB_SUFFIX.patch create mode 100644 wv2-0.4.0-defines.patch create mode 100644 wv2-0.4.0-extra_libs.patch create mode 100644 wv2-0.4.0-multilib.patch delete mode 100644 wv2-fixmultilib.patch delete mode 100644 wv2-gcc43.patch diff --git a/.cvsignore b/.cvsignore index 2eff2f8..1d6fb67 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wv2-0.2.3.tar.bz2 +wv2-0.4.0.tar.bz2 diff --git a/sources b/sources index 84a4b19..8c25308 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea7e3331fbe597185070c0784411a3f7 wv2-0.2.3.tar.bz2 +e0acd7a551c898aab3fb6afafc606bb4 wv2-0.4.0.tar.bz2 diff --git a/wv2-0.2.2-no-extra-libs.patch b/wv2-0.2.2-no-extra-libs.patch deleted file mode 100644 index 1c831f1..0000000 --- a/wv2-0.2.2-no-extra-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 5831227..0000000 --- a/wv2-0.2.2-no-undefined.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 new file mode 100644 index 0000000..ca528ce --- /dev/null +++ b/wv2-0.4.0-LIB_SUFFIX.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 0000000..30af243 --- /dev/null +++ b/wv2-0.4.0-defines.patch @@ -0,0 +1,27 @@ +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 new file mode 100644 index 0000000..112e22b --- /dev/null +++ b/wv2-0.4.0-extra_libs.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000..5c3e05c --- /dev/null +++ b/wv2-0.4.0-multilib.patch @@ -0,0 +1,18 @@ +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 deleted file mode 100644 index de1e932..0000000 --- a/wv2-fixmultilib.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 deleted file mode 100644 index 81578f5..0000000 --- a/wv2-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 7cbb8ab..f65dbe6 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,30 +1,28 @@ Name: wv2 -Version: 0.2.3 -Release: 9%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Summary: A library which allows access to Microsoft® Word files Group: System Environment/Libraries License: LGPLv2 URL: http://wvware.sourceforge.net -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 - +Source0: http://download.sourceforge.net/wvware/wv2-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automake -BuildRequires: libgsf-devel -BuildRequires: libxml2-devel -BuildRequires: glib2-devel -BuildRequires: zlib-devel -BuildRequires: pkgconfig -BuildRequires: libtool +# 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 %description wv is a library which allows access to Microsoft® Word files. It can load and @@ -39,21 +37,22 @@ Requires: %{name} = %{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 -./autogen.sh -%patch4 +%patch3 -p1 -b .multilib +%patch50 -p1 -b .defines +%patch51 -p1 -b .LIB_SUFFIX + %build -%configure --disable-warnings --disable-dependency-tracking +%cmake . + make %{?_smp_mflags} @@ -61,30 +60,43 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la +# unpackaged files +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la + + +%check +make test %{?_smp_mflags} -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}/*.so.* +%{_libdir}/libwv2.so.3* +%dir %{_libdir}/wvWare/ %files devel %defattr(-,root,root,-) %doc doc/* %{_bindir}/wv2-config -%{_libdir}/*.so -%{_includedir}/wv2 +%{_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 From 3e9dc9ec5f85a94bc92e0cb8cd1066f678770859 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Sep 2009 16:47:37 +0000 Subject: [PATCH 11/21] workaround ppc64 bogosity for now --- wv2.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wv2.spec b/wv2.spec index f65dbe6..bee3050 100644 --- a/wv2.spec +++ b/wv2.spec @@ -51,6 +51,7 @@ The wv2-devel package includes the header files necessary for developing. %build + %cmake . make %{?_smp_mflags} @@ -65,7 +66,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %check -make test %{?_smp_mflags} +# checks currently fail on ppc64, appears to be a toolchain prob +%ifarch ppc64 +make -k test ||: +%else +make -k test +%endif %clean From 7cfd1647ee335d75525f8850bec4f6642ff96349 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 8 Oct 2009 14:49:03 +0000 Subject: [PATCH 12/21] upstreamed patches --- wv2.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wv2.spec b/wv2.spec index bee3050..26b1d59 100644 --- a/wv2.spec +++ b/wv2.spec @@ -14,7 +14,9 @@ Patch2: wv2-0.4.0-extra_libs.patch # see bug #343451 Patch3: wv2-0.4.0-multilib.patch ## upstreamable patches +# http://bugzilla.abisource.com/show_bug.cgi?id=12422 Patch50: wv2-0.4.0-defines.patch +# http://bugzilla.abisource.com/show_bug.cgi?id=12421 Patch51: wv2-0.4.0-LIB_SUFFIX.patch BuildRequires: cmake From 9f2e4155f8666530d2005e7f8fa9a60187ddd7fb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 9 Oct 2009 15:24:41 +0000 Subject: [PATCH 13/21] - wv2-0.4.1 (ABI bump) --- .cvsignore | 2 +- sources | 2 +- wv2-0.4.0-defines.patch | 27 --------------------------- wv2.spec | 41 +++++++++++++++++++++-------------------- 4 files changed, 23 insertions(+), 49 deletions(-) delete mode 100644 wv2-0.4.0-defines.patch diff --git a/.cvsignore b/.cvsignore index 1d6fb67..2af7413 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wv2-0.4.0.tar.bz2 +wv2-0.4.1.tar.bz2 diff --git a/sources b/sources index 8c25308..26807ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0acd7a551c898aab3fb6afafc606bb4 wv2-0.4.0.tar.bz2 +7565fcc392c8869c44a301992b3ea561 wv2-0.4.1.tar.bz2 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.spec b/wv2.spec index 26b1d59..55aebf8 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,23 +1,19 @@ + Name: wv2 -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} -Summary: A library which allows access to Microsoft® Word files +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://downloads.sourceforge.net/sourceforge/wvware/wv2-%{version}.tar.bz2 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 -# http://bugzilla.abisource.com/show_bug.cgi?id=12422 -Patch50: wv2-0.4.0-defines.patch -# http://bugzilla.abisource.com/show_bug.cgi?id=12421 -Patch51: wv2-0.4.0-LIB_SUFFIX.patch BuildRequires: cmake BuildRequires: libgsf-devel @@ -27,7 +23,7 @@ BuildRequires: glib2-devel BuildRequires: zlib-devel %description -wv is a library which allows access to Microsoft® Word files. It can load and +wv is a library which allows access to Microsoft Word files. It can load and parse Word 2000, 97, 95 and 6 file formats. (These are the file formats known internally as Word 9, 8, 7 and 6.) There is some support for reading earlier formats as well: Word 2 docs are converted to plaintext. @@ -48,36 +44,38 @@ The wv2-devel package includes the header files necessary for developing. %patch2 -p1 -b .extra_libs %patch3 -p1 -b .multilib -%patch50 -p1 -b .defines -%patch51 -p1 -b .LIB_SUFFIX %build +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake} .. +popd -%cmake . - -make %{?_smp_mflags} +make %{?_smp_mflags} -C %{_target_platform} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} -C %{_target_platform} # unpackaged files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +rm -f %{buildroot}%{_libdir}/lib*.la %check +pushd %{_target_platform} # checks currently fail on ppc64, appears to be a toolchain prob %ifarch ppc64 -make -k test ||: +make -k test -C ||: %else make -k test %endif +popd %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -88,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO -%{_libdir}/libwv2.so.3* +%{_libdir}/libwv2.so.4* %dir %{_libdir}/wvWare/ %files devel @@ -102,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 09 2009 Rex Dieter - 0.4.1-1 +- wv2-0.4.1 (ABI bump) + * Fri Sep 11 2009 Rex Dieter - 0.4.0-1 - wv2-0.4.0 From d1e130e250756fd58cd35bb35782b2df61d9940d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 9 Oct 2009 15:25:35 +0000 Subject: [PATCH 14/21] upstreamed --- wv2-0.4.0-LIB_SUFFIX.patch | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 wv2-0.4.0-LIB_SUFFIX.patch 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 ) From 982fafbe7db0334104bccc563e24a72fbbdb2860 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 22 Oct 2009 15:46:13 +0000 Subject: [PATCH 15/21] - Epoch: 1 --- wv2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wv2.spec b/wv2.spec index 55aebf8..1155182 100644 --- a/wv2.spec +++ b/wv2.spec @@ -1,7 +1,8 @@ Name: wv2 +Epoch: 1 Version: 0.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library which allows access to Microsoft Word files Group: System Environment/Libraries @@ -100,6 +101,9 @@ rm -rf %{buildroot} %changelog +* Thu Oct 22 2009 Rex Dieter - 1:0.4.1-2 +- Epoch: 1 + * Fri Oct 09 2009 Rex Dieter - 0.4.1-1 - wv2-0.4.1 (ABI bump) From 254ca512ffa3a08bfb82dcdc311f3dbeb1c9d3e4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 22 Oct 2009 16:30:58 +0000 Subject: [PATCH 16/21] - fix epoch-related deps --- wv2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wv2.spec b/wv2.spec index 1155182..e48b071 100644 --- a/wv2.spec +++ b/wv2.spec @@ -2,7 +2,7 @@ Name: wv2 Epoch: 1 Version: 0.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library which allows access to Microsoft Word files Group: System Environment/Libraries @@ -32,7 +32,7 @@ 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 @@ -101,6 +101,9 @@ rm -rf %{buildroot} %changelog +* Thu Oct 22 2009 Rex Dieter - 1:0.4.1-3 +- fix epoch-related deps + * Thu Oct 22 2009 Rex Dieter - 1:0.4.1-2 - Epoch: 1 From 10379049e8be8d36ab36bce873bc8806fe54def5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:17 +0000 Subject: [PATCH 17/21] 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 9387543..aac7fc7 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 b3f1db47e6fedff9a48444d47073135dae472a79 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:19:14 +0000 Subject: [PATCH 18/21] 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 441d52460faf9381513ae508fc3ffe62879149e5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 24 Mar 2010 03:12:09 +0000 Subject: [PATCH 19/21] wv2 is now shipped as part of koffice (as of koffice-2.1.81) --- .cvsignore | 1 - dead.package | 1 + sources | 1 - wv2-0.4.0-extra_libs.patch | 12 --- wv2-0.4.0-multilib.patch | 18 ---- wv2.spec | 175 ------------------------------------- 6 files changed, 1 insertion(+), 207 deletions(-) create mode 100644 dead.package delete mode 100644 wv2-0.4.0-extra_libs.patch delete mode 100644 wv2-0.4.0-multilib.patch delete mode 100644 wv2.spec diff --git a/.cvsignore b/.cvsignore index 2af7413..e69de29 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +0,0 @@ -wv2-0.4.1.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..73c7473 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +wv2 is now shipped as part of koffice (as of koffice-2.1.81) diff --git a/sources b/sources index 26807ea..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -7565fcc392c8869c44a301992b3ea561 wv2-0.4.1.tar.bz2 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.spec b/wv2.spec deleted file mode 100644 index e48b071..0000000 --- a/wv2.spec +++ /dev/null @@ -1,175 +0,0 @@ - -Name: wv2 -Epoch: 1 -Version: 0.4.1 -Release: 3%{?dist} -Summary: A library which allows access to Microsoft Word files - -Group: System Environment/Libraries -License: LGPLv2 -URL: http://wvware.sourceforge.net -Source0: http://downloads.sourceforge.net/sourceforge/wvware/wv2-%{version}.tar.bz2 -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 - -BuildRequires: cmake -BuildRequires: libgsf-devel -BuildRequires: libxml2-devel -BuildRequires: pkgconfig -BuildRequires: glib2-devel -BuildRequires: zlib-devel - -%description -wv is a library which allows access to Microsoft Word files. It can load and -parse Word 2000, 97, 95 and 6 file formats. (These are the file formats known -internally as Word 9, 8, 7 and 6.) There is some support for reading earlier -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} = %{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 - -%patch2 -p1 -b .extra_libs -%patch3 -p1 -b .multilib - - -%build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%{cmake} .. -popd - -make %{?_smp_mflags} -C %{_target_platform} - - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -C %{_target_platform} - -# unpackaged files -rm -f %{buildroot}%{_libdir}/lib*.la - - -%check -pushd %{_target_platform} -# checks currently fail on ppc64, appears to be a toolchain prob -%ifarch ppc64 -make -k test -C ||: -%else -make -k test -%endif -popd - - -%clean -rm -rf %{buildroot} - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO -%{_libdir}/libwv2.so.4* -%dir %{_libdir}/wvWare/ - -%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 -* Thu Oct 22 2009 Rex Dieter - 1:0.4.1-3 -- fix epoch-related deps - -* Thu Oct 22 2009 Rex Dieter - 1:0.4.1-2 -- Epoch: 1 - -* Fri Oct 09 2009 Rex Dieter - 0.4.1-1 -- wv2-0.4.1 (ABI bump) - -* 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 - -* Wed Feb 25 2009 Fedora Release Engineering - 0.2.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 22 2008 Andreas Bierfert - 0.2.3-7 -- fix gcc43 build (#433999) - -* Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-6 -- Autorebuild for GCC 4.3 - -* Mon Feb 11 2008 Andreas Bierfert - 0.2.3-5 -- Rebuilt for gcc43 - -* Fri Jan 04 2008 Andreas Bierfert 0.2.3-4 -- fix #343451 multiarch - -* Thu Aug 23 2007 Andreas Bierfert 0.2.3-3 -- new license tag -- rebuild for buildid - -* Fri Sep 15 2006 Andreas Bierfert 0.2.3-2 -- FE6 rebuild -- fix BR - -* Sun Jun 18 2006 Andreas Bierfert 0.2.3-1 -- version upgrade -- fix #195019 (CVE-2006-2197) - -* Wed Mar 22 2006 Andreas Bierfert 0.2.2-9 -- bump for libgsf - -* Tue Feb 21 2006 Andreas Bierfert 0.2.2-8 -- Fix #19229{1,3} -- Tune configure - -* Thu Feb 16 2006 Andreas Bierfert 0.2.2-7 -- Rebuild for Fedora Extras 5 - -* Tue Dec 13 2005 Andreas Bierfert 0.2.2-6 -- rebuild - -* Tue Jul 05 2005 Andreas Bierfert 0.2.2-5 -- add dist tag - -* Fri Jul 01 2005 Andreas Bierfert 0.2.2-4 -- add some Requires for the devel package -- changed some files around -- added missing defattr to devel package - -* Thu Jun 30 2005 Andreas Bierfert 0.2.2-3 -- drop explicit Requires for ldconfig - -* Wed Jun 29 2005 Andreas Bierfert 0.2.2-2 -- added trademarks -- added missing ldconfig - -* Sun Jun 26 2005 Andreas Bierfert 0.2.2-1 -- Initial Release From aab18ec78ad9556f49d7ba7ba5c2b4db14bed17d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:27:43 +0000 Subject: [PATCH 20/21] 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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7 From 1325c92298625a37f305c737ce294ec1e095c28e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:27:49 +0000 Subject: [PATCH 21/21] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 aac7fc7..0000000 --- a/Makefile +++ /dev/null @@ -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 $$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)