Compare commits
6 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
d9f7f30f9b | ||
|
4c0bdf595a | ||
|
17884fe2fd | ||
|
|
bc0b20a7a9 | ||
|
|
45f80fcdaf | ||
|
31edb9f4e4 |
13 changed files with 15 additions and 369 deletions
0
.cvsignore → .gitignore
vendored
0
.cvsignore → .gitignore
vendored
21
Makefile
21
Makefile
|
|
@ -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)
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
c1861c560491f121e12917fa76970ac5 wv-1.2.4.tar.gz
|
||||
a6a3484745aa73897ff9c5a871482b4b wv-1.2.7.tar.gz
|
||||
|
|
|
|||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -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)
|
||||
|
|
@ -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"
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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");
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
||||
33
wv.spec
33
wv.spec
|
|
@ -1,16 +1,11 @@
|
|||
Name: wv
|
||||
Summary: MSWord 6/7/8/9 binary file format to HTML converter
|
||||
Version: 1.2.4
|
||||
Release: 7%{?dist}
|
||||
Version: 1.2.7
|
||||
Release: 2%{?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
|
||||
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
|
|
@ -19,7 +14,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
|
||||
|
|
@ -42,25 +36,16 @@ 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
|
||||
|
||||
sed -i 's/^LT_CURRENT=`expr $WV_MICRO_VERSION - $WV_INTERFACE_AGE`/LT_CURRENT=3/' configure
|
||||
|
||||
%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
|
||||
find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -f {} \;
|
||||
|
||||
%clean
|
||||
|
|
@ -87,6 +72,16 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue