packages: abiword/abiword.spec - rel.2 - reverse goffice bcond, met by defa...

[blues]

Author: blues                        Date: Wed May  5 10:07:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.2 - reverse goffice bcond, met by default now.

---- Files affected:
packages/abiword:
   abiword.spec (1.187 -> 1.188) 

---- Diffs:

================================================================
Index: packages/abiword/abiword.spec
diff -u packages/abiword/abiword.spec:1.187 packages/abiword/abiword.spec:1.188
--- packages/abiword/abiword.spec:1.187	Mon Mar  8 10:20:49 2010
+++ packages/abiword/abiword.spec	Wed May  5 12:07:46 2010
@@ -5,9 +5,9 @@
 #	   /usr/share/mime-info/abiword.keys
 #
 %bcond_without	gda		# libgda support
+%bcond_without	goffice		# without plugin-goffice
 %bcond_without	gnome		# without GNOME libs
 %bcond_with	gnomevfs	# gnome-vfs support
-%bcond_with	goffice		# without plugin-goffice
 %bcond_with	ots		# try build plugin-ots (requires ots >= 0.5.0)
 #
 %define		mver	2.8
@@ -16,7 +16,7 @@
 Summary(pl.UTF-8):	Wieloplatformowy procesor tekstu
 Name:		abiword
 Version:	2.8.2
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL
 Group:		X11/Applications/Editors
@@ -26,28 +26,31 @@
 Patch1:		%{name}-mht.patch
 URL:		http://www.abisource.com/
 BuildRequires:	aiksaurus-gtk-devel >= 1.2.1
-#BuildRequires:	aspell-devel >= 0.60.4
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	boost-devel >= 1.33.1
 BuildRequires:	bzip2-devel
 BuildRequires:	cairo-devel
-#BuildRequires:	curl-devel
 BuildRequires:	enchant-devel >= 1.2.6
 BuildRequires:	eps-devel
 BuildRequires:	fontconfig-devel >= 1:2.3.95
 BuildRequires:	fribidi-devel >= 0.10.4
 BuildRequires:	glib2-devel >= 1:2.12.1
-#BuildRequires:	gnome-scan-devel < 0.6
 BuildRequires:	gtk+2-devel >= 2:2.12.0
 BuildRequires:	gtkmathview-devel >= 0.7.6
 BuildRequires:	gucharmap-devel >= 1.7.0
-%{?with_gda:BuildRequires:	libgda-devel >= 1:1.2.3}
-%{?with_gda:BuildRequires:	libgnomedb-devel >= 1:1.2.0}
-#BuildRequires:	libgnomeprintui-devel >= 2.12.1
+%if %{with gda}
+BuildRequires:	libgda-devel >= 1:1.2.3
+BuildRequires:	libgnomedb-devel >= 1:1.2.0
+%else
+Obsoletes:	abiword-plugin-gda
+%endif
 BuildRequires:	libgnomeui-devel >= 2.15.91
-BuildRequires:	libgoffice-devel >= 0.6.0
-%{?with_goffice:BuildRequires:	libgoffice-devel >= 0.8.0}
+%if %{with goffice}
+BuildRequires:	libgoffice-devel >= 0.8.0
+%else
+Obsoletes:	abiword-plugin-goffice
+%endif
 BuildRequires:	libgsf-devel >= 1.14.9
 #%{?with_gnomevfs:BuildRequires:	libgsf-gnome-devel >= 1.14.1}
 BuildRequires:	libjpeg-devel
@@ -375,6 +378,7 @@
 %{_datadir}/abiword-%{mver}/xsltml
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.png
+%{_mandir}/man1/abiword.1*
 
 # These don't add any additional dependencies so there's no reason to split
 %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/applix.so
@@ -484,6 +488,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.188  2010/05/05 10:07:46  blues
+- rel.2 - reverse goffice bcond, met by default now.
+
 Revision 1.187  2010/03/08 09:20:49  hawk
 - updated to 2.8.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/abiword/abiword.spec?r1=1.187&r2=1.188&f=u