Compare commits

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

51 commits

Author SHA1 Message Date
Filipe Rosset
f6a3e1952d Convert to %autorelease and %autochangelog
[skip changelog]
2026-07-20 17:25:52 -03:00
Fedora Release Engineering
3eb273247b Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:57:18 +00:00
Fedora Release Engineering
4e3579ea4b Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:23:44 +00:00
Fedora Release Engineering
950149c905 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:34:12 +00:00
Fedora Release Engineering
3bd88ecf05 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 15:18:29 +00:00
Miroslav Suchý
0326f205cd convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:43:29 +02:00
Fedora Release Engineering
2ad852d09b Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:35:53 +00:00
Software Management Team
cfe4ab7b28 Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:50 +02:00
Fedora Release Engineering
dd8f909c87 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 09:12:24 +00:00
Fedora Release Engineering
8a7eb570f9 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 18:25:56 +00:00
Fedora Release Engineering
aa1293a772 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 07:03:01 +00:00
Fedora Release Engineering
f15b6b52f8 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 12:41:11 +00:00
ec6749893f Drop duplicate %configure in %prep
%configure invokes the code that is part of the package and should be
in %build. This package called %configure twice, the first one is
dropped.

If https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/172
is merged, %configure would start throwing an error. This change
is proactively to avoid a later build failure. No rebuild will
be done.
2022-01-25 15:10:36 +01:00
Fedora Release Engineering
85909b5f70 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 04:43:13 +00:00
Fedora Release Engineering
87b2d921ad - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 21:11:36 +00:00
Fedora Release Engineering
b3adc59f35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 23:43:02 +00:00
Tom Stellard
51a9941b16 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 01:03:06 +00:00
Fedora Release Engineering
436465fddc - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 14:22:32 +00:00
Fedora Release Engineering
83b599b596 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 04:00:06 +00:00
Fedora Release Engineering
a8335fee6f - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 03:46:33 +00:00
Fedora Release Engineering
17a0102090 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 11:59:31 +00:00
f3ad259f7c Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:55 +01:00
b6e630052a
Remove obsolete ldconfig scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-22 18:41:20 +01:00
Fedora Release Engineering
deb83e61f3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 09:01:50 +00:00
Igor Gnatenko
978e863513 add BuildRequires: gcc
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:53 +02:00
Fedora Release Engineering
398bd1e0f7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 21:13:02 +00:00
Fedora Release Engineering
e52c2b5db7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 10:24:06 +00:00
Fedora Release Engineering
4950ba30f2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 21:48:07 +00:00
Fedora Release Engineering
ac77d92aa4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 17:34:35 +00:00
Fedora Release Engineering
0b5116cdd0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 03:11:50 +00:00
Dennis Gilmore
6490a1f08e - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-19 02:38:18 +00:00
Till Maas
4a8fe1b1d9 Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
2015-02-21 22:28:29 +01:00
d89fcc08cb - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 08:59:11 +00:00
Dennis Gilmore
b7dab9248f - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 23:59:38 -05:00
Rahul Sundaram
a9cc8f601a add patch to support aarch64 (rhbz#926731)
- add patch to build with format security flag (rhbz#1037388)
- use make_install macro and drop redundant defattr
2013-12-12 17:16:41 -05:00
Dennis Gilmore
8e6bd2b1fc - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 02:22:51 -05:00
Dennis Gilmore
a649269435 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 21:21:15 -06:00
Dennis Gilmore
35f3840a55 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-21 23:08:53 -05:00
Dennis Gilmore
abcaa078cc - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-14 02:31:46 -06:00
Adam Jackson
0481e5911a Rebuild for new libpng 2011-12-06 01:30:25 -05:00
Dennis Gilmore
b88da3fd3e - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-07 21:16:37 -06:00
Rahul Sundaram
c4b36a3c05 - 1.2.8 broke binary compatibility but was never imported in Fedora. 1.2.9 fixes it
- Fix bug 10025: Segfault trying to parse certain word documents (Jean Brefort)
- Fix bug 12746: Tables not imported from MS Word documents (Martin Sevior)
- Fix Bug 11433 wvWare hangs on this seemingly blank word doc (Martin Sevior)
- Buildfix: Remove unused LINK_WIN32_DLL check (Fridrich Strba)
- Buildfix: link with -no-undefined (Fridrich Strba)
2010-12-29 17:49:16 +05:30
Fedora Release Engineering
2497f1627b dist-git conversion 2010-07-29 15:27:35 +00:00
Rahul Sundaram
3b6c71a030 temp hack 2009-12-22 05:57:21 +00:00
Rahul Sundaram
26eac4e0a6 new upstream release 2009-12-11 14:26:51 +00:00
Rahul Sundaram
edd7af72a2 new upstream release source 2009-11-29 05:35:56 +00:00
Rahul Sundaram
2970ff4bc5 new upstream release 2009-11-29 01:13:54 +00:00
Bill Nottingham
3cac8bfcb2 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 22:43:17 +00:00
Jesse Keating
4064c8feb0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild 2009-07-27 07:29:44 +00:00
Jesse Keating
7bab7330b2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild 2009-02-26 07:22:26 +00:00
84b806dd85 rebuild to get provides pkgconfig(wv-1.0) >= 0:1.2.0 2009-01-12 09:41:56 +00:00
17 changed files with 1677 additions and 439 deletions

View file

@ -1 +0,0 @@
wv-1.2.4.tar.gz

2
.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
wv-1.2.7.tar.gz
/wv-1.2.9.tar.gz

View file

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

186
changelog Normal file
View file

@ -0,0 +1,186 @@
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.2.9-31
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.9-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.2.9-11
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.9-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu Dec 12 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 1.2.9-8
- add patch to support aarch64 (rhbz#926731)
- add patch to build with format security flag (rhbz#1037388)
- use make_install macro and drop redundant defattr
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.9-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.2.9-3
- Rebuild for new libpng
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Dec 29 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 1.2.9-1
- 1.2.8 broke binary compatibility but was never imported in Fedora. 1.2.9 fixes it
- Fix bug 10025: Segfault trying to parse certain word documents (Jean Brefort)
- Fix bug 12746: Tables not imported from MS Word documents (Martin Sevior)
- Fix Bug 11433 wvWare hangs on this seemingly blank word doc (Martin Sevior)
- Buildfix: Remove unused LINK_WIN32_DLL check (Fridrich Strba)
- Buildfix: link with -no-undefined (Fridrich Strba)
* Tue Dec 22 2009 Rahul Sundaram <sundaram@fedoraproject.org> - 1.2.7-2
- Workaround a incorrect soname bump
* Fri Dec 11 2009 Rahul Sundaram <sundaram@fedoraproject.org> - 1.2.7-1
- New upstream release that fixes a regression
- Resolves rhbz#546406,546406
* Sun Nov 29 2009 Rahul Sundaram <sundaram@fedoraproject.org> - 1.2.6-1
- Changelog at rhbz#511221
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Jan 12 2009 Caolán McNamara <caolanm@redhat.com> - 1.2.4-5
- rebuild to get provides pkgconfig(wv-1.0) >= 0:1.2.0
* Sun Mar 30 2008 Michel Salim <michel.sylvan@gmail.com> - 1.2.4-4
- fix libdir in wv's pkgconfig entry
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.2.4-3
- Autorebuild for GCC 4.3
* Sun Aug 26 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.2.4-2
- fix license tag
- rebuild for BuildID
* Sat Oct 28 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.2.4-1
- update to 1.2.4, fixes #212696 (CVE-2006-4513)
* Fri Sep 08 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.2.1-7
- rebuild (releases 1 to 7, cvs problem)
* Fri Sep 08 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.2.1-1
- version 1.2.1
* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-4
- rebuild
* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-3
- don't build the static lib
* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-2
- rebuild for FC5
* Fri Nov 11 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-1
- version 1.2.0
* Fri Oct 28 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-2
- split out a -devel package (#171962)
* Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}
- new version
- fix build with gcc4
- use dist tag
* Tue May 10 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-5
- Include printf format fix for bug 150461.
* Thu Apr 07 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt
* Wed Jul 28 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.0-0.fdr.3
- fix security vulnerability (CAN-2004-0645)
* Fri May 14 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.0-0.fdr.2
- add several patches
- depend on glib2 (bug 1592)
* Wed May 12 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.0-0.fdr.1
- initial RPM (from Mandrake)

11
format-security.patch Normal file
View file

@ -0,0 +1,11 @@
--- wv-1.2.9/wvRTF.c.orig 2013-12-12 17:03:41.635612853 -0500
+++ wv-1.2.9/wvRTF.c 2013-12-12 17:04:05.528003832 -0500
@@ -192,7 +192,7 @@
rtf_output_char ('{');
/* font color */
- rtf_output (rtfColors[ud->cCol]);
+ rtf_output ("%s", rtfColors[ud->cCol]);
/* font face */
rtf_output ("\\f%d", ud->cFont);

View file

@ -1 +1 @@
c1861c560491f121e12917fa76970ac5 wv-1.2.4.tar.gz
dbccf2e9f747e50c913b7e3d126b73f7 wv-1.2.9.tar.gz

View file

@ -1,12 +0,0 @@
diff -Nur wv-1.0.0-orig/wvWare.c wv-1.0.0/wvWare.c
--- wv-1.0.0-orig/wvWare.c 2003-08-24 17:22:25.000000000 +0200
+++ wv-1.0.0/wvWare.c 2005-05-10 07:32:55.000000000 +0200
@@ -1246,7 +1246,7 @@
*/
printf ("\n\\resizebox{%dpt}{%dpt}\
{\\includegraphics{%s.eps}}\
- \n% -- %#.2x graphic -- \n", width, height, source, graphicstype);
+ \n%% -- %#.2x graphic -- \n", width, height, source, graphicstype);
}
else
{

View file

@ -1,40 +0,0 @@
--- wv-1.0.0/wvConfig.c.gcc4 2005-05-08 23:17:35.000000000 -0400
+++ wv-1.0.0/wvConfig.c 2005-05-08 23:18:42.000000000 -0400
@@ -2130,7 +2130,7 @@
}
static void
-startElement (void *userData, const XML_Char *name, const XML_Char **atts)
+wvStartElement (void *userData, const XML_Char *name, const XML_Char **atts)
{
unsigned int nAtts = 0;
const XML_Char **p;
@@ -3094,7 +3094,7 @@
}
static void
-endElement (void *userData, const XML_Char *name)
+wvEndElement (void *userData, const XML_Char *name)
{
state_data *mydata = (state_data *) userData;
unsigned int token_type;
@@ -3470,8 +3470,8 @@
memset(&hdl, 0, sizeof(hdl));
hdl.getEntity = _getEntity;
- hdl.startElement = startElement;
- hdl.endElement = endElement;
+ hdl.startElement = wvStartElement;
+ hdl.endElement = wvEndElement;
hdl.characters = charData;
if (myhandle->fp)
@@ -3514,7 +3514,7 @@
size_t len;
XML_SetUserData (parser, myhandle);
- XML_SetElementHandler (parser, startElement, endElement);
+ XML_SetElementHandler (parser, wvStartElement, wvEndElement);
XML_SetCharacterDataHandler (parser, charData);
if (myhandle->fp == NULL)

View file

@ -1,11 +0,0 @@
--- wv-1.0.3/exporter/support.c.oledecod 2005-05-08 22:50:23.000000000 +0200
+++ wv-1.0.3/exporter/support.c 2005-05-08 22:50:53.000000000 +0200
@@ -10,7 +10,7 @@
#endif
#include "config.h"
#include "wv.h"
-#include "oledecod.h"
+#include "ms-ole.h"
#include "wvexporter-priv.h"

View file

@ -1,10 +0,0 @@
--- 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

1460
wv-aarch64.patch Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,11 +0,0 @@
--- ./wvDocBook.in.filename 2004-05-14 07:16:27.000000000 +0200
+++ ./wvDocBook.in 2004-05-14 07:16:37.000000000 +0200
@@ -116,7 +116,7 @@
if test "x$datadir" = "x"; then
datadir=@datadir@
fi
-xmlcfg="$datadir/wv/wvDocBook.xml"
+xmlcfg="$datadir/wv/wvDocbook.xml"
if test -r "$xmlcfg"; then
okay=yes
else

View file

@ -1,70 +0,0 @@
Index: field.c
===================================================================
RCS file: /cvsroot/wv/field.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- field.c 29 Dec 2002 16:37:00 -0000 1.19
+++ field.c 5 Jul 2004 18:10:03 -0000 1.20
@@ -98,18 +98,21 @@
case 1:
sprintf (temp, "%d", current->tm_mon+1);
strcat (timestr, temp);
+ consumed += strlen (temp);
break;
case 2:
strcat (timestr, "%m");
+ consumed += 2;
break;
case 3:
strcat (timestr, "%b");
+ consumed += 2;
break;
default:
strcat (timestr, "%B");
+ consumed += 2;
break;
}
- consumed += 2;
break;
case 's':
case 'S':
@@ -139,6 +142,7 @@
case 1:
consumed += sprintf (temp, "%d", current->tm_wday);
strcat (timestr, temp);
+ consumed += strlen (temp);
break;
case 2:
strcat (timestr, "%d");
@@ -182,12 +186,13 @@
case 1:
sprintf (temp, "%d", current->tm_hour % 12);
strcat (timestr, temp);
+ consumed += strlen (temp);
break;
default:
strcat (timestr, "%I");
+ consumed += 2;
break;
}
- consumed += 2;
break;
case 'H':
no = lookahead (token, 'H', 'H');
@@ -197,6 +202,7 @@
case 1:
consumed += sprintf (temp, "%d", current->tm_hour);
strcat (timestr, temp);
+ consumed += strlen (temp);
break;
default:
strcat (timestr, "%H");
@@ -212,6 +218,7 @@
case 1:
consumed += sprintf (temp, "%d", current->tm_min);
strcat (timestr, temp);
+ consumed += strlen (temp);
break;
default:
strcat (timestr, "%M");

View file

@ -1,12 +0,0 @@
--- ./wvDVI.in.copy 2004-05-14 07:27:41.000000000 +0200
+++ ./wvDVI.in 2004-05-14 07:29:43.000000000 +0200
@@ -299,5 +299,7 @@
exit 1
fi
-cp -f "$name".dvi "$o_file"
-rm -f "$name".dvi
+if [ "$name".dvi != "$o_file" ]; then
+ cp -f "$name".dvi "$o_file"
+ rm -f "$name".dvi
+fi

View file

@ -1,55 +0,0 @@
--- ./wvMime.tmp-filename 2004-05-14 07:18:23.000000000 +0200
+++ ./wvMime 2004-05-14 08:18:18.000000000 +0200
@@ -42,34 +42,37 @@
# temporary PS file, mangled to get some sort
# of semi-uniqueness
-FILE=`basename ${1}`
-TMPDIR="/tmp/${FILE}-${USER}-${$}"
-TMPPS="$TMPDIR/${FILE}-${USER}-${$}.ps"
-
-mkdir $TMPDIR
+FILE="`basename "${1}"`"
+TMPDIR=$(mktemp -d /tmp/wvMime.XXXXXXXX) || { echo "$0: can not create temporary directory" >& 2; exit 1; }
+TMPPS="$TMPDIR/tmp.ps"
+TMPFILE="$TMPDIR/tmpfile"
+TMPTEX="$TMPDIR/tmp.tex"
+#TMPPS="$TMPDIR/${FILE}-${USER}-${$}.ps"
# Make sure all graphics go into /tmp as well
-cp ${1} $TMPDIR/$FILE
+cp "${1}" "$TMPFILE"
# Extract graphics
-wvLatex "$TMPDIR/$FILE" "$TMPDIR/$FILE.tex" 2>/dev/null >/dev/null
+wvLatex "$TMPFILE" "$TMPTEX" 2>/dev/null >/dev/null
# Graphics conversion if make_epses.sh installed:
-STEM=$TMPDIR/`basename ${1} .doc`
-type make_epses.sh 2>&1 >/dev/null
- if [ ${?} -eq "0" ]; then
- (cd $TMPDIR; make_epses.sh $STEM)
- fi
+#STEM=$TMPDIR/"`basename "${1}" .doc`"
+#type make_epses.sh >/dev/null 2>&1
+# if [ ${?} -eq "0" ]; then
+# (cd $TMPDIR; make_epses.sh $STEM)
+# fi
-wvPS $TMPDIR/$FILE ${TMPPS}
+cd $TMPDIR
+wvPS `basename $TMPFILE` `basename ${TMPPS}`
if [ ${?} -ne "0" ]; then
echo "Could not translate into Postscript"
+ rm -rf $TMPDIR
exit 1
fi
# call our ghost-viewer
-${GV} ${TMPPS}
-rm -f ${TMPPS}
+${GV} "${TMPPS}"
+rm -f "${TMPPS}"
cd /
rm -rf $TMPDIR

View file

@ -1,107 +0,0 @@
--- wvText.in
+++ wvText.in
@@ -3,24 +3,50 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
datadir=@datadir@
-tmpdir=/tmp
+tmpdir=$(mktemp -d /tmp/wvText.XXXXXXXX) || { echo "$0: can not create temporary directory" >& 2; exit 1; }
+i_file=
+o_file=
# argument checking
-if [ ${#} -ne "2" ]; then
- echo "Usage: ${0} <word document> <text output file>"
+
+case ${#} in
+ 1)
+ i_file=${1}
+ o_file=-
+ ;;
+ 2)
+ i_file=${1}
+ o_file=${2}
+ ;;
+ *)
+ echo "Usage: `basename ${0}` <word document> [<text output file>]"
exit 1
-fi
+ ;;
+esac
# start out optimistic
-USING_LYNX=1
-which lynx >/dev/null 2>&1
-if [ ${?} -ne "0" ]; then
- echo "Could not find required program 'lynx'"
- echo "Not using lynx. Ouput will be pretty bad."
- USING_LYNX=0
-fi
+USING_BROWSER=1
+BROWSER_CMD="w3m -dump -T text/html"
+browser=none
+
+which lynx >& /dev/null && browser=lynx
+which w3m >& /dev/null && browser=w3m
+
+case $browser in
+ w3m)
+ BROWSER_CMD="w3m -dump -T text/html"
+ ;;
+ lynx)
+ BROWSER_CMD="lynx -dump -force_html"
+ ;;
+ *)
+ echo "Neither w3m nor lynx found"
+ echo "Output will be pretty bad."
+ USING_BROWSER=0
+ ;;
+esac
-if [ ${USING_LYNX} -ne "0" ]; then
+if [ ${USING_BROWSER} -ne "0" ]; then
# first, test for wvHtml
which wvHtml >/dev/null 2>&1
@@ -32,25 +58,34 @@
# intermediate file
TMP_FILE="wv$$.html"
- wvHtml "${1}" --targetdir="${tmpdir}" "${TMP_FILE}" >/dev/null 2>&1
+ wvHtml "$i_file" --targetdir="${tmpdir}" "${TMP_FILE}" >/dev/null 2>&1
if [ ${?} -ne "0" ]; then
- echo "Could not convert into HTML"
+ echo "Could not convert $i_file into HTML"
exit 1
fi
# lynx actually does quite well
- TERM=vt100 lynx -dump -force_html "${tmpdir}/${TMP_FILE}" > "${2}"
+ # Output to stdout requested
+ if test "x$o_file" = "x-"; then
+ TERM=vt100 ${BROWSER_CMD} "${tmpdir}/${TMP_FILE}"
+ else
+ TERM=vt100 ${BROWSER_CMD} "${tmpdir}/${TMP_FILE}" > "$o_file"
+ fi
if [ ${?} -ne "0" ]; then
- echo "Could not convert into Text"
+ echo "Could not convert $i_file into Text"
exit 1
fi
# clean up
- rm -f "${tmpdir}/${TMP_FILE}"
+ rm -rf "${tmpdir}"
else
# fall back onto our cruddy output
# this is, admittedly, better than running
# 'strings' on the word document though :)
- wvWare -x ${datadir}/wv/wvText.xml "${1}" > "${2}"
+ if test "x$o_file" = "x-"; then
+ wvWare -x ${datadir}/wv/wvText.xml "$i_file"
+ else
+ wvWare -x ${datadir}/wv/wvText.xml "$i_file" > "$o_file"
+ fi
fi

103
wv.spec
View file

@ -1,17 +1,16 @@
Name: wv
Summary: MSWord 6/7/8/9 binary file format to HTML converter
Version: 1.2.4
Release: 4%{?dist}
License: GPLv2+
Group: Applications/Text
URL: http://wvware.sourceforge.net
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
Version: 1.2.9
Release: %autorelease
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
URL: http://www.abisource.com/downloads/wv/
Source: http://www.abisource.com/downloads/wv/%{version}/wv-%{version}.tar.gz
Patch1: wv-aarch64.patch
Patch2: format-security.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: glib2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@ -19,7 +18,6 @@ BuildRequires: libxml2-devel
BuildRequires: ImageMagick-devel
BuildRequires: pkgconfig
BuildRequires: libgsf-devel >= 1.11.2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: wvware = %{version}-%{release}
%description
@ -30,7 +28,6 @@ documents into HTML, which can then be read with a browser.
%package devel
Summary: MSWord format converter - development files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
@ -42,37 +39,23 @@ This package contains the development files
%prep
%setup -q
#%patch0
#%patch1 -p1 -b .oledecod
#%patch2 -p1 -b .gcc4
%patch5 -p1 -b .printf-rhbug150461
%patch6 -p1 -b .pkgconfig
%patch -P1 -p1
%patch -P2 -p1
%build
%configure --with-exporter \
--with-libxml2 \
--disable-static
%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#ln -sf wvConvert $RPM_BUILD_ROOT/%{_bindir}/wvText
%make_install
find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -f {} \;
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%files
%defattr(-,root,root)
%doc COPYING README
%{_bindir}/wv*
%{_datadir}/wv
@ -80,64 +63,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libwv*.so.*
%files devel
%defattr(-,root,root)
%{_includedir}/wv
%{_libdir}/libwv*.so
%{_libdir}/pkgconfig/*
%changelog
* Sun Mar 30 2008 Michel Salim <michel.sylvan@gmail.com> - 1.2.4-4
- fix libdir in wv's pkgconfig entry
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.2.4-3
- Autorebuild for GCC 4.3
* Sun Aug 26 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.2.4-2
- fix license tag
- rebuild for BuildID
* Sat Oct 28 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.2.4-1
- update to 1.2.4, fixes #212696 (CVE-2006-4513)
* Fri Sep 08 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.2.1-7
- rebuild (releases 1 to 7, cvs problem)
* Fri Sep 08 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.2.1-1
- version 1.2.1
* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-4
- rebuild
* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-3
- don't build the static lib
* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-2
- rebuild for FC5
* Fri Nov 11 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-1
- version 1.2.0
* Fri Oct 28 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-2
- split out a -devel package (#171962)
* Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}
- new version
- fix build with gcc4
- use dist tag
* Tue May 10 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-5
- Include printf format fix for bug 150461.
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt
* Wed Jul 28 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.0-0.fdr.3
- fix security vulnerability (CAN-2004-0645)
* Fri May 14 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.0-0.fdr.2
- add several patches
- depend on glib2 (bug 1592)
* Wed May 12 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0.0-0.fdr.1
- initial RPM (from Mandrake)
%autochangelog