Author: grzegol Date: Tue Aug 15 10:19:02 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added eps15 patch (fixes build with eps-1.5)
- removed without eps bcond
- BR: eps-devel >= 1.5
---- Files affected:
SPECS:
abiword.spec (1.128 -> 1.129)
---- Diffs:
================================================================
Index: SPECS/abiword.spec
diff -u SPECS/abiword.spec:1.128 SPECS/abiword.spec:1.129
--- SPECS/abiword.spec:1.128 Sun Aug 13 12:14:38 2006
+++ SPECS/abiword.spec Tue Aug 15 12:18:56 2006
@@ -6,8 +6,6 @@
#
#%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
#
@@ -26,6 +24,7 @@
Patch2: %{name}-mailmerge.patch
Patch3: %{name}-poppler05x.patch
Patch4: %{name}-goffice03.patch
+Patch5: %{name}-eps15.patch
URL: http://www.abisource.com/
BuildRequires: autoconf
BuildRequires: automake
@@ -34,10 +33,7 @@
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: eps-devel >= 1.5
BuildRequires: fontconfig-devel >= 1:2.3.95
BuildRequires: fribidi-devel >= 0.10.4
BuildRequires: glib2-devel >= 1:2.12.1
@@ -730,6 +726,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p0
+%patch5 -p1
# use generic icon name
sed -i -e 's|abiword_48.png|abiword.png|' abi/GNUmakefile.am
@@ -754,8 +751,7 @@
cd ../abiword-plugins
./nextgen.sh
-%configure \
- %{!?with_eps:--with-inter7eps=no}
+%configure
%{__make}
%install
@@ -995,6 +991,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.129 2006/08/15 10:18:56 grzegol
+- added eps15 patch (fixes build with eps-1.5)
+- removed without eps bcond
+- BR: eps-devel >= 1.5
+
Revision 1.128 2006/08/13 10:14:38 grzegol
- added without eps bcond (doesn't build with eps-1.5)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/abiword.spec?r1=1.128&r2=1.129&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
