- merged from DEVEL

Changed files:
    abiword.spec -> 1.109

diff --git a/abiword.spec b/abiword.spec
index 14d79b18b3d80903ec06fb791ee687ec0041cc3a..39798f2c9026eb3d3e38b5eaf78ad1265199b244 100644 (file)
--- a/abiword.spec
+++ b/abiword.spec
@@ -1,24 +1,24 @@
 #
 # TODO:
+# - link-grammar
 # - polish/complete descriptions
 #
 %bcond_without gnome   # without GNOME libs
 #
-%define                mver    2.2
+%define                mver    2.4
 Summary:       Multi-platform word processor
 Summary(pl):   Wieloplatformowy procesor tekstu
 Name:          abiword
-Version:       2.2.9
-Release:       2
+Version:       2.4.1
+Release:       1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.bz2
-# Source0-md5: 17fe5169f03643dd59c83af7cf1c448a
+# Source0-md5: 03d47aad66c4c9f9d329e3538de97dcd
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-home_etc.patch
-Patch2:                %{name}-python24.patch
-Patch3:                %{name}-mailmerge.patch
+Patch2:                %{name}-mailmerge.patch
 URL:           http://www.abisource.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -32,6 +32,7 @@ BuildRequires:        fontconfig-devel >= 1.0
 BuildRequires: fribidi-devel >= 0.10.4
 BuildRequires: glib2-devel >= 2.0.0
 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 >= 0.90.0
@@ -40,7 +41,8 @@ BuildRequires:        libgnomedb-devel >= 0.90.0
 BuildRequires: libgnomeprintui-devel >= 2.2.1.3-2
 BuildRequires: libgnomeprint-devel >= 2.2.1
 BuildRequires: libgnomeui-devel >= 2.2.0
-BuildRequires: libgsf-devel >= 1.4.0
+BuildRequires: libgoffice >= 0.0.2
+BuildRequires: libgsf-devel >= 1.12.1
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: librsvg-devel >= 2.0
@@ -50,9 +52,9 @@ BuildRequires:        libwpd-devel >= 0.8.0
 BuildRequires: libxml2-devel >= 2.4.20
 BuildRequires: ots-devel >= 0.4.1
 BuildRequires: pkgconfig >= 0.9.0
+BuildRequires: poppler-glib-devel >= 0.2.1
 BuildRequires: popt-devel
 BuildRequires: psiconv-devel >= 0.9.6
-BuildRequires: python-devel >= 1:2.4
 BuildRequires: wv-devel >= 1.0.3
 BuildRequires: xft-devel >= 2.0
 Obsoletes:     abiword-plugin-gdkpixbuf
@@ -98,6 +100,19 @@ Allows to translate selected text.
 %description plugin-babelfish -l pl
 Wtyczka ta pozwala na przet³umaczenie wybranego tekstu.
 
+# abiCollab plugin
+%package plugin-collab
+Summary:       Remote collaborate for AbiWord
+Summary(pl):   Zdalna wspó³praca dla AbiWord
+Group:         Applications/Productivity
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-collab
+Allows to collaborate with a remote user.
+
+%description plugin-collab -l pl
+Pozwala na wspó³pracê z innym u¿ytkownikiem przez sieæ.
+
 # abiCommand plugin
 %package plugin-command
 Summary:       AbiWord command line control
@@ -179,6 +194,21 @@ Allows to edit embedded images with a paint program like Gimp.
 Wtyczka ta pozwala na edycjê osadzonych obrazów programem do ich
 obróbki, takim jak Gimp.
 
+# abiGOChart plugin
+%package plugin-goffice
+Summary:       GNOME Office plugin
+Summary(pl):   Wtyczka GNOME Office
+Group:         Applications/Productivity
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-goffice
+Allows to share GNOME Office objects between GOffice
+appplications.
+
+%description plugin-goffice -l pl
+Pozwala na wspó³dzielenie obiektów GNOME Office pomiêdzy jego
+aplikacjami.
+
 # abiGoogle
 %package plugin-google
 Summary:       AbiWord Google plugin
@@ -193,17 +223,18 @@ Search Google for selected text.
 Wtyczka ta s³u¿y do przeszukiwania Google w poszukiwaniu zaznaczonego
 tekstu.
 
-%package plugin-gypsython
-Summary:       AbiWord Gyspsython plugin
-Summary(pl):   Wtyczka Gypsython dla Abiworda
+# abiMathView
+%package plugin-mathview
+Summary:       AbiWord MathView plugin
+Summary(pl):   Wtyczka MAthView dla AbiWorda
 Group:         Applications/Productivity
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
-%description plugin-gypsython
-Python MailMerge.
+%description plugin-mathview
+MathML or LaTeX style equation inserting and editing.
 
-%description plugin-gypsython -l pl
-Python MailMerge.
+%description plugin-mathview -l pl
+Pozwala na wstawianie i edycjê równañ w styleuMathML lub LaTeX.
 
 # abiOTS
 %package plugin-ots
@@ -218,19 +249,6 @@ Create document summaries.
 %description plugin-ots -l pl
 Wtyczka ta s³u¿y do tworzenia podsumowania dokumentu.
 
-# abiReferee - not documented
-%package plugin-referee
-Summary:       AbiWord Referee plugin
-Summary(pl):   Wtyczka Referee dla Abiworda
-Group:         Applications/Productivity
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description plugin-referee
-Referee plugin.
-
-%description plugin-referee -l pl
-Wtyczka Referee.
-
 # abiScriptHappy - not documented
 %package plugin-scripthappy
 Summary:       AbiWord ScriptHappy plugin
@@ -484,6 +502,19 @@ nroff/man file format.
 %description plugin-nroff -l pl
 Typy plików nroff/man.
 
+# abiOpenDocument
+%package plugin-opendocument
+Summary:       AbiWord OpenDocument plugin
+Summary(pl):   Wtyczka OpenDocument dla Abiworda
+Group:         Applications/Productivity
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-opendocument
+Import/export OpenDocument files.
+
+%description plugin-opendocument -l pl
+Wtyczka ta s³u¿y do importu/eksportu plików OpenDocument.
+
 # abiOpenWriter
 %package plugin-openwritter
 Summary:       AbiWord OpenWriter plugin
@@ -523,6 +554,19 @@ Passepartout plugin.
 %description plugin-passepartout -l pl
 Wtyczka Passepartout.
 
+# abiPDF
+%package plugin-pdf
+Summary:       AbiWord PDF plugin
+Summary(pl):   Wtyczka PDF dla Abiworda
+Group:         Applications/Productivity
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-pdf
+Exports documents to PDF format.
+
+%description plugin-pdf -l pl
+Eksportuje dokumenty do formatu PDF.
+
 # abiPsion
 %package plugin-psion
 Summary:       AbiWord Psion plugin
@@ -671,7 +715,6 @@ Jest to teczka clipart
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # use generic icon name
 sed -i -e 's|abiword_48.png|abiword.png|' abi/GNUmakefile.am
@@ -749,6 +792,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiCAPI.so
 
+%files plugin-collab
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiCollab.so
+
 %files plugin-command
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiCommand.so
@@ -773,22 +820,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiGimp.so
 
+%files plugin-goffice
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiGOChart.so
+
 %files plugin-google
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiGoogle.so
 
-%files plugin-gypsython
+%files plugin-mathview
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiGypsython.so
+%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiMathView.so
 
 %files plugin-ots
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiOTS.so
 
-%files plugin-referee
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiReferee.so
-
 %files plugin-scripthappy
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiScriptHappy.so
@@ -817,10 +864,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiClarisWorks.so
 
-#%files plugin-coquille
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiCoquille.so
-
 %files plugin-docbook
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiDocBook.so
@@ -865,6 +908,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiNroff.so
 
+%files plugin-opendocument
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiOpenDocument.so
+
 %files plugin-openwritter
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiOpenWriter.so
@@ -877,6 +924,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiPassepartout.so
 
+%files plugin-pdf
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiPDF.so
+
 %files plugin-psion
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiPsion.so