OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Oct-2006 12:48:41
Branch: HEAD Handle: 2006101511484000
Modified files:
openpkg-src/abiword abiword.patch abiword.spec
Log:
some style cleanups and a small fix taken over from Michael Schloh
Summary:
Revision Changes Path
1.9 +12 -0 openpkg-src/abiword/abiword.patch
1.46 +4 -4 openpkg-src/abiword/abiword.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/abiword/abiword.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 abiword.patch
--- openpkg-src/abiword/abiword.patch 21 Nov 2005 08:26:04 -0000 1.8
+++ openpkg-src/abiword/abiword.patch 15 Oct 2006 10:48:40 -0000 1.9
@@ -107,3 +107,15 @@
}
s_bInitDone = bRet;
}
+Index: abi/src/wp/impexp/xp/ie_mailmerge.h
+--- abi/src/wp/impexp/xp/ie_mailmerge.h.orig 2005-11-18 16:11:18 +0100
++++ abi/src/wp/impexp/xp/ie_mailmerge.h 2005-11-18 16:12:08 +0100
+@@ -28,6 +28,8 @@
+ typedef UT_sint32 IEMergeType;
+ #define IEMT_Unknown ((IEMergeType)-1)
+
++class IE_MailMerge; // forward to 'friend' construct in IE_MergeSniffer
++
+ class ABI_EXPORT IE_MergeSniffer : public UT_AbiObject
+ {
+ friend class IE_MailMerge;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/abiword/abiword.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 abiword.spec
--- openpkg-src/abiword/abiword.spec 13 Oct 2006 17:26:38 -0000 1.45
+++ openpkg-src/abiword/abiword.spec 15 Oct 2006 10:48:40 -0000 1.46
@@ -33,7 +33,7 @@
Group: DTP
License: GPL
Version: 2.4.1
-Release: 20061013
+Release: 20061015
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/abiword/abiword-%{version}.tar.gz
@@ -53,12 +53,12 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, pkgconfig
-BuildPreReq: glib2, glib2::with_threads = yes, expat
-BuildPreReq: fontconfig, fribidi, jpeg, libiconv
-BuildPreReq: libglade, popt, png, xft, libxml, zlib, cairo
PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: glib2, glib2::with_threads = yes, expat
PreReq: glib2, glib2::with_threads = yes, expat
+BuildPreReq: fontconfig, fribidi, jpeg, libiconv
PreReq: fontconfig, fribidi, jpeg, libiconv
+BuildPreReq: libglade, popt, png, xft, libxml, zlib, cairo
PreReq: libglade, popt, png, xft, libxml, zlib, cairo
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
