Author: glen Date: Fri Mar 21 13:55:21 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- update from HEAD
---- Files affected:
SPECS:
abiword.spec (1.120.2.1.2.1.2.5 -> 1.120.2.1.2.1.2.6)
---- Diffs:
================================================================
Index: SPECS/abiword.spec
diff -u SPECS/abiword.spec:1.120.2.1.2.1.2.5
SPECS/abiword.spec:1.120.2.1.2.1.2.6
--- SPECS/abiword.spec:1.120.2.1.2.1.2.5 Wed Mar 19 14:20:56 2008
+++ SPECS/abiword.spec Fri Mar 21 14:55:16 2008
@@ -1,7 +1,12 @@
# $Revision$, $Date$
#
# 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
#
@@ -19,7 +24,9 @@
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
@@ -29,20 +36,18 @@
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
@@ -57,6 +62,7 @@
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
@@ -149,6 +155,7 @@
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.
@@ -720,6 +727,8 @@
%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
@@ -736,11 +745,16 @@
--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
@@ -808,9 +822,11 @@
%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)
@@ -820,9 +836,11 @@
%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)
@@ -978,6 +996,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.120.2.1.2.1.2.6 2008-03-21 13:55:16 glen
+- update from HEAD
+
Revision 1.120.2.1.2.1.2.5 2008-03-19 13:20:56 glen
- HEAD merge
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/abiword.spec?r1=1.120.2.1.2.1.2.5&r2=1.120.2.1.2.1.2.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
