Author: grzegol                      Date: Sun Aug 13 10:14:43 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added without eps bcond (doesn't build with eps-1.5)

---- Files affected:
SPECS:
   abiword.spec (1.127 -> 1.128) 

---- Diffs:

================================================================
Index: SPECS/abiword.spec
diff -u SPECS/abiword.spec:1.127 SPECS/abiword.spec:1.128
--- SPECS/abiword.spec:1.127    Fri Aug 11 22:29:55 2006
+++ SPECS/abiword.spec  Sun Aug 13 12:14:38 2006
@@ -6,6 +6,8 @@
 #
 #%bcond_without        gnome   # without GNOME libs
 #%bcond_without        gda     # libgda support
+%bcond_without eps     # without inter7 EPS support (doesn't build with
+                       # eps-1.5)
 #
 %define                mver    2.4
 #
@@ -32,7 +34,10 @@
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: enchant-devel >= 1.2.6
+%if %{with eps}
 BuildRequires: eps-devel >= 1.2
+BuildConflicts:        eps-devel >= 1.5
+%endif
 BuildRequires: fontconfig-devel >= 1:2.3.95
 BuildRequires: fribidi-devel >= 0.10.4
 BuildRequires: glib2-devel >= 1:2.12.1
@@ -740,7 +745,7 @@
        --enable-threads \
        --with-libxml2 \
        --with-pspell \
-       --with-sys-wv 
+       --with-sys-wv
 
 # see TODO     
 #      --%{!?with_gnome:dis}%{?with_gnome:en}able-gnome \
@@ -749,7 +754,8 @@
 
 cd ../abiword-plugins
 ./nextgen.sh
-%configure
+%configure \
+       %{!?with_eps:--with-inter7eps=no}
 %{__make}
 
 %install
@@ -989,6 +995,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2006/08/13 10:14:38  grzegol
+- added without eps bcond (doesn't build with eps-1.5)
+
 Revision 1.127  2006/08/11 20:29:55  freetz
 - corrected commitlog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/abiword.spec?r1=1.127&r2=1.128&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to