rpms/abiword/FC-4 abiword.spec,1.15,1.16

[Marc Maurer (uwog)]

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5550

Modified Files:
	abiword.spec 
Log Message:
Fix bug 161832, add gsf dep, disable collaboration plugin




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- abiword.spec	11 Oct 2005 19:55:56 -0000	1.15
+++ abiword.spec	23 Oct 2005 13:05:54 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -34,6 +34,7 @@
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
 BuildRequires: link-grammar-devel >= 4.1.3
 BuildRequires: gtkmathview-devel >= 0.7.5
+BuildRequires: libgsf-devel >= 1.11.1
 
 # gnome build deps
 BuildRequires: libbonobo-devel
@@ -66,9 +67,14 @@
 cd ../abiword-plugins
 libtoolize --copy --force
 ./nextgen.sh
-%configure --disable-gda --with-abiword=../abi
+%configure --disable-gda --disable-abicollab --with-abiword=../abi
+# Remove libtool predep_objects and postdep_objects wonkiness so that
+# building without -nostdlib doesn't include them twice.  Because we
+# already link with g++, weird stuff happens if you don't let the
+# compiler handle this.
 sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo
-sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool
+sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool.foobar
+sed 's/-shared -nostdlib/-shared/' < libtool.foobar > libtool
 make
 
 # now make the docs
@@ -132,6 +138,11 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sun Oct 23 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.1-2.fc4
+- Fix bug 161832: "Abiword is not loading certain modules"
+- Add libgsf dependecy, which was needed all along
+- Disable the collaboration plugin, it is not for general use at all
+
 * Tue Oct 11 2005 Marc Maurer <uwog at abisource.com> 1:2.4.1-1.fc4
 - Update to 2.4.1
 - Add patch to depend on libgsf 1.11.1 for the OpenDocument