Compare commits

...
Sign in to create a new pull request.

8 commits

Author SHA1 Message Date
Fedora Release Engineering
1325c92298 dist-git conversion 2010-07-29 15:27:49 +00:00
441d52460f wv2 is now shipped as part of koffice (as of koffice-2.1.81) 2010-03-24 03:12:09 +00:00
Bill Nottingham
10379049e8 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 22:43:17 +00:00
254ca512ff - fix epoch-related deps 2009-10-22 16:30:58 +00:00
982fafbe7d - Epoch: 1 2009-10-22 15:46:13 +00:00
d1e130e250 upstreamed 2009-10-09 15:25:35 +00:00
9f2e4155f8 - wv2-0.4.1 (ABI bump) 2009-10-09 15:24:41 +00:00
7cfd1647ee upstreamed patches 2009-10-08 14:49:03 +00:00
10 changed files with 1 additions and 270 deletions

View file

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

0
.gitignore vendored Normal file
View file

View file

@ -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)

1
dead.package Normal file
View file

@ -0,0 +1 @@
wv2 is now shipped as part of koffice (as of koffice-2.1.81)

View file

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

View file

@ -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 )

View file

@ -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;

View file

@ -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@"

View file

@ -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

165
wv2.spec
View file

@ -1,165 +0,0 @@
Name: wv2
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://download.sourceforge.net/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
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
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} = %{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
%patch50 -p1 -b .defines
%patch51 -p1 -b .LIB_SUFFIX
%build
%cmake .
make %{?_smp_mflags}
%install
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
%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/
%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
* 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
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Fri Feb 22 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.2.3-7
- fix gcc43 build (#433999)
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.2.3-6
- Autorebuild for GCC 4.3
* Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.2.3-5
- Rebuilt for gcc43
* Fri Jan 04 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.3-4
- fix #343451 multiarch
* Thu Aug 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.3-3
- new license tag
- rebuild for buildid
* Fri Sep 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.3-2
- FE6 rebuild
- fix BR
* Sun Jun 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.3-1
- version upgrade
- fix #195019 (CVE-2006-2197)
* Wed Mar 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.2-9
- bump for libgsf
* Tue Feb 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.2-8
- Fix #19229{1,3}
- Tune configure
* Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.2-7
- Rebuild for Fedora Extras 5
* Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.2-6
- rebuild
* Tue Jul 05 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.2-5
- add dist tag
* Fri Jul 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 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 <andreas.bierfert[AT]lowlatency.de> 0.2.2-3
- drop explicit Requires for ldconfig
* Wed Jun 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.2-2
- added trademarks
- added missing ldconfig
* Sun Jun 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.2-1
- Initial Release