OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 18-Nov-2003 23:07:07
Branch: HEAD Handle: 2003111822070502
Modified files:
openpkg-src/abiword abiword.spec
openpkg-web news.txt
Log:
Correct endian typo in case statement, fix putenv(3) param type, and
link to common libs dynamically
Summary:
Revision Changes Path
1.8 +9 -3 openpkg-src/abiword/abiword.spec
1.7465 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/abiword/abiword.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 abiword.spec
--- openpkg-src/abiword/abiword.spec 17 Nov 2003 14:11:25 -0000 1.7
+++ openpkg-src/abiword/abiword.spec 18 Nov 2003 22:07:07 -0000 1.8
@@ -37,7 +37,7 @@
Group: Editor
License: GPL
Version: %{V_opkg}
-Release: 20031117
+Release: 20031118
# list of sources
Source0:
http://download.sourceforge.net/sourceforge/abiword/abiword-%{V_dist}.tar.gz
@@ -82,13 +82,16 @@
%setup8 -q -n abiword-%{V_dist} -T -D -a 8
%setup10 -q -n abiword-%{V_dist} -T -D -a 10
;;
- *68*-* )
+ *86*-* )
%setup1 -q -n abiword-%{V_dist} -T -D -a 1
%setup3 -q -n abiword-%{V_dist} -T -D -a 3
%setup5 -q -n abiword-%{V_dist} -T -D -a 5
%setup7 -q -n abiword-%{V_dist} -T -D -a 7
%setup9 -q -n abiword-%{V_dist} -T -D -a 9
;;
+ * ) echo "Only SPARC and ix86 architectures are supported" 2>&1
+ exit 1
+ ;;
esac
%{l_shtool} subst \
-e 's;^\( *ICONV_CONST char\);//\1;' \
@@ -123,6 +126,9 @@
-e 's;\(/clipart/\);/abiword\1;' \
abi/src/wp/ap/xp/ap_EditMethods.cpp
%{l_shtool} subst \
+ -e 's;putenv(MYLANG;putenv((char *)MYLANG;' \
+ abi/src/af/xap/unix/xap_UnixEncodingManager.cpp
+ %{l_shtool} subst \
-e 's;\(/icons/\);/abiword\1;' \
abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_About.cpp \
abi/src/af/xap/unix/xap_UnixFrameImpl.cpp
@@ -239,7 +245,7 @@
--with-libjpeg-prefix=%{l_prefix}
# build the program
- %{l_make} %{l_mflags} AbiWord_2_0_LDFLAGS=-static
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7464 -r1.7465 news.txt
--- openpkg-web/news.txt 18 Nov 2003 18:58:23 -0000 1.7464
+++ openpkg-web/news.txt 18 Nov 2003 22:07:05 -0000 1.7465
@@ -1,3 +1,4 @@
+18-Nov-2003: Upgraded package: P<abiword-2.0.1.2-20031118>
18-Nov-2003: Upgraded package: P<subversion-0.33.1-20031118>
18-Nov-2003: Upgraded package: P<dmalloc-5.2.4-20031118>
18-Nov-2003: Upgraded package: P<xmlto-0.0.16-20031118>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
