Parcourir la source

Depend on new xft package, removing important obstacle

Michael Schloh von Bennewitz il y a 22 ans
Parent
commit
62465dfa76
1 fichiers modifiés avec 4 ajouts et 6 suppressions
  1. 4 6
      abiword/abiword.spec

+ 4 - 6
abiword/abiword.spec

@@ -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 @@ Summary:      X11 Word Processor
 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 @@ Source10:     http://download.sourceforge.net/sourceforge/abiword/abispell-en-US
 #   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 @@ AutoReqProv:  no
     %{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;' \