- rel 6

[packages/abiword.git] / abiword.spec

diff --git a/abiword.spec b/abiword.spec
index cf4cba74e60940271ee595ee26df8447f210bdd5..0c4da5bc9723c6168fe364eb5c0c61aa789bf8ff 100644 (file)
--- a/abiword.spec
+++ b/abiword.spec
@@ -5,6 +5,7 @@
 #
 #%bcond_without        gnome   # without GNOME libs
 #%bcond_without        gda     # libgda support
+%bcond_with    goffice # try build plugin-goffice
 #
 %define                mver    2.4
 #
@@ -12,7 +13,7 @@ Summary:      Multi-platform word processor
 Summary(pl.UTF-8):     Wieloplatformowy procesor tekstu
 Name:          abiword
 Version:       2.4.6
-Release:       1
+Release:       6
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
@@ -22,8 +23,9 @@ Patch0:               %{name}-desktop.patch
 Patch1:                %{name}-home_etc.patch
 Patch2:                %{name}-mailmerge.patch
 Patch3:                %{name}-poppler05x.patch
-Patch4:                %{name}-goffice03.patch
+Patch4:                %{name}-goffice05.patch
 Patch5:                %{name}-eps15.patch
+Patch6:                %{name}-poppler-0.6-api.patch
 URL:           http://www.abisource.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -44,7 +46,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.1
+%{?with_goffice:BuildRequires: libgoffice-devel >= 0.5.0}
 BuildRequires: libgsf-devel >= 1.14.1
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -56,7 +58,7 @@ BuildRequires:        libxml2-devel >= 1:2.6.26
 BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: ots-devel >= 0.4.1
 BuildRequires: pkgconfig >= 0.9.0
-BuildRequires: poppler-glib-devel >= 0.5.3
+BuildRequires: poppler-glib-devel >= 0.6
 BuildRequires: popt-devel
 BuildRequires: psiconv-devel >= 0.9.6
 BuildRequires: t1lib-devel
@@ -724,8 +726,9 @@ Jest to teczka clipartów używanych przez AbiWorda.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch5 -p1
 %patch4 -p0
+%patch5 -p1
+%patch6 -p0
 
 # use generic icon name
 sed -i -e 's|abiword_48.png|abiword.png|' abi/GNUmakefile.am
@@ -750,7 +753,8 @@ cd abi
 
 cd ../abiword-plugins
 ./nextgen.sh
-%configure
+%configure \
+       %{!?with_goffice:--disable-abigochart}
 %{__make}
 
 %install
@@ -832,9 +836,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiGimp.so
 
+%if %{with goffice}
 %files plugin-goffice
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiGOChart.so
+%endif
 
 %files plugin-google
 %defattr(644,root,root,755)