- update from HEAD

Changed files:
    abiword.spec -> 1.120.2.1.2.1.2.6

diff --git a/abiword.spec b/abiword.spec
index 80018710da1fb3c959566015c29b8e17f7c27af5..22ac2f6b1fc6cc868c5673767c6e245811dc8760 100644 (file)
--- a/abiword.spec
+++ b/abiword.spec
@@ -1,6 +1,11 @@
 #
 # TODO:
-# - polish/complete descriptions
+# - complete descriptions
+# - fix broken bconds
+#
+%bcond_without gnome   # without GNOME libs
+%bcond_without gda     # libgda support
+%bcond_without goffice # try build plugin-goffice
 #
 %define                mver    2.4
 #
@@ -18,7 +23,9 @@ Patch0:               %{name}-desktop.patch
 Patch1:                %{name}-home_etc.patch
 Patch2:                %{name}-mailmerge.patch
 Patch3:                %{name}-poppler05x.patch
-Patch4:                %{name}-poppler-0.6-api.patch
+Patch4:                %{name}-goffice05.patch
+Patch5:                %{name}-eps15.patch
+Patch6:                %{name}-poppler-0.6-api.patch
 URL:           http://www.abisource.com/
 BuildRequires: aiksaurus-gtk-devel >= 1.0
 BuildRequires: aspell-devel >= 0.50.0
@@ -28,20 +35,18 @@ BuildRequires:      bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: enchant-devel >= 1.1.5
 BuildRequires: eps-devel >= 1.2
-BuildRequires: fontconfig-devel >= 1.0
+BuildRequires: fontconfig-devel >= 1:2.3.95
 BuildRequires: fribidi-devel >= 0.10.4
-BuildRequires: glib2-devel >= 2.0.0
+BuildRequires: glib2-devel >= 1:2.12.1
 BuildRequires: gtk+2-devel >= 2.2.0
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: gucharmap-devel >= 1.4.0
-BuildRequires: libbonobo-devel >= 2.2.0
 BuildRequires: libgda-devel >= 1:1.2.3
 BuildRequires: libglade2-devel >= 2.0.0
 BuildRequires: libgnomedb-devel >= 1:1.2.2
-BuildRequires: libgnomeprint-devel >= 2.2.1
 BuildRequires: libgnomeprintui-devel >= 2.2.1.3-2
 BuildRequires: libgnomeui-devel >= 2.2.0
-BuildRequires: libgoffice-devel >= 0.1.0
+%{?with_goffice:BuildRequires: libgoffice-devel >= 0.1.0}
 BuildRequires: libgsf-devel >= 1.12.1
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -56,6 +61,7 @@ BuildRequires:        pkgconfig >= 0.9.0
 BuildRequires: poppler-glib-devel >= 0.2.1
 BuildRequires: popt-devel
 BuildRequires: psiconv-devel >= 0.9.6
+BuildRequires: t1lib-devel
 BuildRequires: wv-devel >= 1.0.3
 Requires(post,postun): desktop-file-utils
 Obsoletes:     abiword-plugin-collab
@@ -148,6 +154,7 @@ Summary:    AbiWord GDA plugin
 Summary(pl.UTF-8):     Wtyczka AbiWorda dla GDA
 Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      gnome-database-access-properties >= 1:1.2.1
 
 %description plugin-gda
 Allows access to any database provided by libgda.
@@ -719,6 +726,8 @@ Jest to teczka clipartów używanych przez AbiWorda.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p0
+%patch5 -p1
+%patch6 -p0
 
 # use generic icon name
 sed -i -e 's|abiword_48.png|abiword.png|' abi/GNUmakefile.am
@@ -735,11 +744,16 @@ cd abi
        --with-libxml2 \
        --with-pspell \
        --with-sys-wv
+
+# see TODO
+#      --%{!?with_gnome:dis}%{?with_gnome:en}able-gnome \
+
 %{__make}
 
 cd ../abiword-plugins
 ./nextgen.sh
-%configure
+%configure \
+       %{!?with_goffice:--disable-abigochart}
 %{__make}
 
 %install
@@ -807,9 +821,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiFreeTranslation.so
 
+%if %{with gda}
 %files plugin-gda
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiGDA.so
+%endif
 
 %files plugin-gdict
 %defattr(644,root,root,755)
@@ -819,9 +835,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)