SPECS (for-AC): abiword.spec - rel.2, dropped broken bconds, reint...

[freetz]

Author: freetz                       Date: Wed Aug  9 17:55:37 2006 GMT
Module: SPECS                         Tag: for-AC
---- Log message:
- rel.2, dropped broken bconds, reintroduced stable gda/gnomedb dependency

---- Files affected:
SPECS:
   abiword.spec (1.120.2.1 -> 1.120.2.1.2.1) 

---- Diffs:

================================================================
Index: SPECS/abiword.spec
diff -u SPECS/abiword.spec:1.120.2.1 SPECS/abiword.spec:1.120.2.1.2.1
--- SPECS/abiword.spec:1.120.2.1	Mon Jul 17 19:41:51 2006
+++ SPECS/abiword.spec	Wed Aug  9 19:55:32 2006
@@ -3,15 +3,13 @@
 # TODO:
 # - polish/complete descriptions
 #
-%bcond_without	gnome	# without GNOME libs
-%bcond_without	gda	# libgda support
-#
 %define		mver	2.4
+#
 Summary:	Multi-platform word processor
 Summary(pl):	Wieloplatformowy procesor tekstu
 Name:		abiword
 Version:	2.4.5
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL
 Group:		X11/Applications
@@ -20,8 +18,7 @@
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-mailmerge.patch
-Patch3:		%{name}-gda.patch
-Patch4:		%{name}-poppler05x.patch
+Patch3:		%{name}-poppler05x.patch
 URL:		http://www.abisource.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -38,9 +35,9 @@
 BuildRequires:	gtkmathview-devel >= 0.7.5
 BuildRequires:	gucharmap-devel >= 1.4.0
 BuildRequires:	libbonobo-devel >= 2.2.0
-%{?with_gda:BuildRequires:	libgda-devel >= 0.90.0}
+BuildRequires:	libgda-devel >= 1:1.2.3
 BuildRequires:	libglade2-devel >= 2.0.0
-BuildRequires:	libgnomedb-devel >= 0.90.0
+BuildRequires:	libgnomedb-devel >= 1:1.2.2
 BuildRequires:	libgnomeprintui-devel >= 2.2.1.3-2
 BuildRequires:	libgnomeprint-devel >= 2.2.1
 BuildRequires:	libgnomeui-devel >= 2.2.0
@@ -722,7 +719,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 # use generic icon name
 sed -i -e 's|abiword_48.png|abiword.png|' abi/GNUmakefile.am
@@ -734,7 +730,6 @@
 %{__automake}
 %{__autoconf}
 %configure \
-	--%{!?with_gnome:dis}%{?with_gnome:en}able-gnome \
 	--disable-static \
 	--enable-threads \
 	--with-libxml2 \
@@ -812,11 +807,9 @@
 %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)
@@ -984,6 +977,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120.2.1.2.1  2006/08/09 17:55:32  freetz
+- rel.2, dropped broken bconds, reintroduced stable gda/gnomedb dependency
+
 Revision 1.120.2.1  2006/07/17 17:41:51  freetz
 - 2.4.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/abiword.spec?r1=1.120.2.1&r2=1.120.2.1.2.1&f=u