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: 17-Nov-2003 15:11:25
Branch: HEAD Handle: 2003111714112302
Modified files:
openpkg-src/abiword abiword.spec
openpkg-web news.txt
Log:
Depend on new xft package, removing important obstacle
Summary:
Revision Changes Path
1.7 +4 -6 openpkg-src/abiword/abiword.spec
1.7445 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/abiword/abiword.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 abiword.spec
--- openpkg-src/abiword/abiword.spec 12 Nov 2003 15:30:33 -0000 1.6
+++ openpkg-src/abiword/abiword.spec 17 Nov 2003 14:11:25 -0000 1.7
@@ -23,9 +23,6 @@
## SUCH DAMAGE.
##
-# FIXME: ms: Junk because a modern X11 server with Xft is required,
-# FIXME: and is generally bad mannered with build configuration
-
# package version
%define V_opkg 2.0.1.2
%define V_dist 2.0.1-2
@@ -36,11 +33,11 @@
URL: http://www.abisource.com/
Vendor: Abi the Ant
Packager: The OpenPKG Project
-Distribution: OpenPKG [JUNK]
+Distribution: OpenPKG [EVAL]
Group: Editor
License: GPL
Version: %{V_opkg}
-Release: 20031112
+Release: 20031117
# list of sources
Source0:
http://download.sourceforge.net/sourceforge/abiword/abiword-%{V_dist}.tar.gz
@@ -58,7 +55,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, fontconfig, pkgconfig, fribidi
+BuildPreReq: OpenPKG, openpkg >= 20030103, fontconfig, pkgconfig, fribidi, xft
BuildPreReq: glib2, glib2::with_threads = yes, libiconv, libglade, zlib, popt
PreReq: OpenPKG, openpkg >= 20030103, fontconfig
AutoReq: no
@@ -100,6 +97,7 @@
%{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} ;' \
abi/configure
%{l_shtool} subst \
-e 's;\((pkgdatadir)\/\)AbiWord;\1abiword;' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7444 -r1.7445 news.txt
--- openpkg-web/news.txt 17 Nov 2003 13:27:32 -0000 1.7444
+++ openpkg-web/news.txt 17 Nov 2003 14:11:23 -0000 1.7445
@@ -1,3 +1,4 @@
+17-Nov-2003: Upgraded package: P<abiword-2.0.1.2-20031117>
17-Nov-2003: Upgraded package: P<xscreensaver-4.14-20031117>
17-Nov-2003: Upgraded package: P<fsl-1.4a1-20031117>
17-Nov-2003: Upgraded package: P<xrender-0.8.3-20031117>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]