OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 28-Dec-2003 12:47:09
Branch: HEAD Handle: 2003122811470503
Added files:
openpkg-src/abiword abiword.patch
Modified files:
openpkg-re/vcheck vc.abiword
openpkg-src/abiword abiword.spec
openpkg-web news.txt
Log:
upgrading package: abiword 2.0.2 -> 2.1.0
Summary:
Revision Changes Path
1.5 +1 -1 openpkg-re/vcheck/vc.abiword
1.1 +20 -0 openpkg-src/abiword/abiword.patch
1.10 +5 -10 openpkg-src/abiword/abiword.spec
1.7903 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.abiword
============================================================================
$ cvs diff -u -r1.4 -r1.5 vc.abiword
--- openpkg-re/vcheck/vc.abiword 11 Dec 2003 20:55:32 -0000 1.4
+++ openpkg-re/vcheck/vc.abiword 28 Dec 2003 11:47:05 -0000 1.5
@@ -2,7 +2,7 @@
}
prog abiword = {
- version = 2.0.2
+ version = 2.1.0
url = http://download.sourceforge.net/sourceforge/abiword/
regex = abiword-(\d+\.\d+\.\d+(-\d+)?)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/abiword/abiword.patch
============================================================================
$ cvs diff -u -r0 -r1.1 abiword.patch
--- /dev/null 2003-12-28 12:47:09.000000000 +0100
+++ abiword.patch 2003-12-28 12:47:09.000000000 +0100
@@ -0,0 +1,20 @@
+Index: abi/src/af/util/xp/ut_iconv.cpp
+--- abi/src/af/util/xp/ut_iconv.cpp.orig 2003-12-28 12:24:14.000000000 +0100
++++ abi/src/af/util/xp/ut_iconv.cpp 2003-12-28 12:31:24.000000000 +0100
+@@ -49,6 +49,7 @@
+
+ /************************************************************************/
+ /************************************************************************/
++A
+
+ /* UGLY UGLY Iconv hack for operating systems with strange declartions
+ for iconv. Why, oh why can't they all be the same? <sob> I will
+@@ -67,7 +68,7 @@
+ #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) || \
+ (defined (__MACH__) && defined (__APPLE__)) || \
+ (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
+-defined(__BEOS__) || defined (__AIX__) || \
++defined(__BEOS__) || defined (__AIX__) || defined(__FreeBSD__) || \
+ (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) &&
(__GLIBC_MINOR__ <= 1))
+
+ #define ICONV_CONST const
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/abiword/abiword.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 abiword.spec
--- openpkg-src/abiword/abiword.spec 11 Dec 2003 20:55:34 -0000 1.9
+++ openpkg-src/abiword/abiword.spec 28 Dec 2003 11:47:08 -0000 1.10
@@ -24,8 +24,8 @@
##
# package version
-%define V_opkg 2.0.2
-%define V_dist 2.0.2
+%define V_opkg 2.1.0
+%define V_dist 2.1.0
# package information
Name: abiword
@@ -37,7 +37,7 @@
Group: Editor
License: GPL
Version: %{V_opkg}
-Release: 20031211
+Release: 20031228
# list of sources
Source0:
http://download.sourceforge.net/sourceforge/abiword/abiword-%{V_dist}.tar.gz
@@ -51,6 +51,7 @@
Source8:
http://download.sourceforge.net/sourceforge/abiword/abispell-en-GB.ppc.tar.gz
Source9:
http://download.sourceforge.net/sourceforge/abiword/abispell-en-US.i386.tar.gz
Source10:
http://download.sourceforge.net/sourceforge/abiword/abispell-en-US.ppc.tar.gz
+Patch0: abiword.patch
# build information
Prefix: %{l_prefix}
@@ -74,6 +75,7 @@
%prep
%setup0 -q -n abiword-%{V_dist}
+ %patch0 -p0
case "%{l_platform -t}" in
sparc*-* )
%setup2 -q -n abiword-%{V_dist} -T -D -a 2
@@ -94,10 +96,6 @@
;;
esac
%{l_shtool} subst \
- -e 's;^\( *ICONV_CONST char\);//\1;' \
- -e 's;\( *return iconv( cd, \);\1in;' \
- abi/src/af/util/xp/ut_iconv.cpp
- %{l_shtool} subst \
-e 's;^\(ABIWORD_APP_NAME=\)"AbiWord";\1"abiword";' \
-e 's;^\(ABIWORD_APP_LIBDIR=\)"AbiWord";\1"abiword";' \
-e 's;GTK_CFLAGS=;GTK_CFLAGS=%{l_cppflags} ;' \
@@ -145,9 +143,6 @@
abi/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp \
abi/src/wp/ap/win/ap_Win32Dialog_Background.cpp \
abi/src/wp/ap/xp/ap_EditMethods.cpp
- %{l_shtool} subst \
- -e 's;\(docdir.*share/\)AbiSuite-2.0/AbiWord/help;\1abiword/help;' \
- abiword-docs/Makefile
%{l_shtool} subst \
-e 's;/@PACKAGE@;;' \
abi/src/af/ev/qnx/GNUmakefile.in \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7902 -r1.7903 news.txt
--- openpkg-web/news.txt 28 Dec 2003 11:37:22 -0000 1.7902
+++ openpkg-web/news.txt 28 Dec 2003 11:47:07 -0000 1.7903
@@ -1,3 +1,4 @@
+28-Dec-2003: Upgraded package: P<abiword-2.1.0-20031228>
28-Dec-2003: Upgraded package: P<openpkg-20031228-20031228>
28-Dec-2003: Upgraded package: P<scribus-1.1.4-20031228>
28-Dec-2003: Upgraded package: P<ncurses-5.3.20031227-20031228>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
