- rel 1

[packages/abiword.git] / abiword.spec

diff --git a/abiword.spec b/abiword.spec
index 710c2d47bdd0fbb98c709a1a480d42d18d7d0d44..38b7874f80517351d3f2b57194b9af1456ab092f 100644 (file)
--- a/abiword.spec
+++ b/abiword.spec
@@ -1,30 +1,29 @@
 #
 # TODO:
-# - polish/complete descriptions
+# - complete descriptions
 # - fix broken bconds
 #
 #%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
 #
 Summary:       Multi-platform word processor
 Summary(pl):   Wieloplatformowy procesor tekstu
 Name:          abiword
-Version:       2.4.5
-Release:       2
+Version:       2.4.6
+Release:       1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.bz2
-# Source0-md5: e018669a154164d31c768f773a1c95b4
+# Source0-md5: 8ed5fb282b9741aca75b9e47500d39a1
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-home_etc.patch
 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
@@ -33,10 +32,7 @@ BuildRequires:       aspell-devel >= 0.60.4
 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
@@ -48,7 +44,7 @@ BuildRequires:        libglade2-devel >= 1:2.6.0
 BuildRequires: libgnomedb-devel >= 1:1.2.2
 BuildRequires: libgnomeprintui-devel >= 2.12.1
 BuildRequires: libgnomeui-devel >= 2.15.91
-BuildRequires: libgoffice-devel >= 0.3.0
+BuildRequires: libgoffice-devel >= 0.3.1
 BuildRequires: libgsf-devel >= 1.14.1
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -728,6 +724,7 @@ Jest to teczka clipart
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch5 -p1
 %patch4 -p0
 
 # use generic icon name
@@ -753,8 +750,7 @@ cd abi
 
 cd ../abiword-plugins
 ./nextgen.sh
-%configure \
-       %{!?with_eps:--with-inter7eps=no}
+%configure
 %{__make}
 
 %install
@@ -793,7 +789,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/AbiSuite-%{mver}/AbiWord/system.profile*
 %{_datadir}/AbiSuite-%{mver}/icons
 %{_datadir}/AbiSuite-%{mver}/templates
-%{_desktopdir}/*
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.png
 %{_datadir}/AbiSuite-%{mver}/AbiWord/readme.txt
 %{_libdir}/AbiWord-%{mver}/plugins/AbiWord