SPECS: abiword.spec - added bcond goffice (plugin-goffice doesn't ...

sls sls at pld-linux.org
Fri Oct 12 16:14:01 CEST 2007


Author: sls                          Date: Fri Oct 12 14:14:01 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added bcond goffice (plugin-goffice doesn't build with goffice-0.5)

---- Files affected:
SPECS:
   abiword.spec (1.143 -> 1.144) 

---- Diffs:

================================================================
Index: SPECS/abiword.spec
diff -u SPECS/abiword.spec:1.143 SPECS/abiword.spec:1.144
--- SPECS/abiword.spec:1.143	Sun Sep 30 17:20:14 2007
+++ SPECS/abiword.spec	Fri Oct 12 16:13:55 2007
@@ -6,6 +6,7 @@
 #
 #%bcond_without	gnome	# without GNOME libs
 #%bcond_without	gda	# libgda support
+%bcond_with	goffice	# try build plugin-goffice
 #
 %define		mver	2.4
 #
@@ -46,7 +47,7 @@
 BuildRequires:	libgnomedb-devel >= 1:1.2.2
 BuildRequires:	libgnomeprintui-devel >= 2.12.1
 BuildRequires:	libgnomeui-devel >= 2.15.91
-BuildRequires:	libgoffice-devel >= 0.5.0
+%{?with_goffice:BuildRequires:	libgoffice-devel >= 0.5.0}
 BuildRequires:	libgsf-devel >= 1.14.1
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
@@ -753,7 +754,8 @@
 
 cd ../abiword-plugins
 ./nextgen.sh
-%configure
+%configure \
+	%{!?with_goffice:--disable-abigochart}
 %{__make}
 
 %install
@@ -835,9 +837,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)
@@ -993,6 +997,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.144  2007/10/12 14:13:55  sls
+- added bcond goffice (plugin-goffice doesn't build with goffice-0.5)
+
 Revision 1.143  2007/09/30 15:20:14  blues
 - added goffice05 patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/abiword.spec?r1=1.143&r2=1.144&f=u



More information about the pld-cvs-commit mailing list