rpms/abiword/devel .cvsignore, 1.17, 1.18 abiword.spec, 1.58, 1.59 sources, 1.17, 1.18 abiword-2.6.0-textbox.patch, 1.1, NONE abiword-extras-2.6.0-destdir.patch, 1.1, NONE abiword-plugins-2.6.0-no-libboost-thread.patch, 1.1, NONE abiword-plugins-2.6.0-regression.patch, 1.1, NONE abiword-plugins-2.6.0-xmpp.patch, 1.1, NONE nextgen.sh, 1.1, NONE

Sun Apr 6 21:05:22 UTC 2008

Author: uwog

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28816

Modified Files:
	.cvsignore abiword.spec sources 
Removed Files:
	abiword-2.6.0-textbox.patch abiword-extras-2.6.0-destdir.patch 
	abiword-plugins-2.6.0-no-libboost-thread.patch 
	abiword-plugins-2.6.0-regression.patch 
	abiword-plugins-2.6.0-xmpp.patch nextgen.sh 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18

--- .cvsignore	27 Mar 2008 22:53:11 -0000	1.17
+++ .cvsignore	6 Apr 2008 21:04:42 -0000	1.18
@@ -1,4 +1,4 @@
-abiword-2.6.0.tar.gz
-abiword-plugins-2.6.0.tar.gz
-abiword-extras-2.6.0.tar.gz
-abiword-docs-2.6.0.tar.gz
+abiword-2.6.1.tar.gz
+abiword-docs-2.6.1.tar.gz
+abiword-extras-2.6.1.tar.gz
+abiword-plugins-2.6.1.tar.gz


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- abiword.spec	29 Mar 2008 16:27:02 -0000	1.58
+++ abiword.spec	6 Apr 2008 21:04:42 -0000	1.59
@@ -1,11 +1,11 @@
 %define majorversion 2
 %define minorversion 6
-%define microversion 0
+%define microversion 1
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.6.0
-Release: 6%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -14,7 +14,6 @@
 Source2: http://abisource.com/downloads/abiword/%{version}/source/abiword-extras-%{version}.tar.gz
 Source3: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
 Source11: abiword.mime
-Source12: nextgen.sh
 Requires: mathml-fonts
 Requires: link-grammar >= 4.2.2
 
@@ -51,12 +50,6 @@
 Patch1: abiword-2.6.0-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-plugins-2.6.0-boolean.patch
-Patch5: abiword-plugins-2.6.0-xmpp.patch
-Patch6: abiword-plugins-2.6.0-regression.patch
-Patch7: abiword-extras-2.6.0-destdir.patch
-Patch8: abiword-2.6.0-textbox.patch
-Patch9: abiword-extras-2.6.0-nohash.patch
-Patch10: abiword-plugins-2.6.0-no-libboost-thread.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. It is full-featured,
@@ -69,19 +62,13 @@
 %if 0%{?fedora} >= 9
 %patch2 -p1 -b .boolean
 %endif
-%patch8 -p1 -b .textbox
 
 # setup abiword-plugins
 %setup -q -T -b 1 -n abiword-plugins-%{version}
 %patch3 -p1 -b .boolean
-%patch5 -p1 -b .xmpp
-%patch6 -p1 -b .regression
-%patch10 -p1 -b .no-libboost-thread
 
 # setup abiword extras
 %setup -q -T -b 2 -n abiword-extras-%{version}
-%patch7 -p1 -b .destdir
-%patch9 -p1 -b .nohash
 
 # setup abiword documentation
 %setup -q -T -b 3 -n abiword-docs-%{version}
@@ -96,10 +83,7 @@
 
 # build abiword-plugins
 cd $RPM_BUILD_DIR/abiword-plugins-%{version}
-# we need to re-autogen, as we have changed the abicollab automake configuration
-cp %{SOURCE12} $RPM_BUILD_DIR/abiword-plugins-%{version}
-./nextgen.sh
-%configure --disable-gda --disable-gremlin --disable-abicapi --disable-presentation --with-abiword=../abiword-%{version}
+%configure --disable-gda --with-abiword=../abiword-%{version}
 # 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
@@ -187,8 +171,12 @@
 %{_datadir}/icons/*png
 %ghost %{_includedir}/%{name}-%{majorversion}.%{minorversion}
 %ghost %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
+%ghost %{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml
 
 %changelog
+* Sun Apr 06 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.1-1
+- New upstream release
+
 * Sat Mar 29 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.0-6
 - Don't forget to cvs add nextgen.sh
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	27 Mar 2008 22:53:11 -0000	1.17
+++ sources	6 Apr 2008 21:04:42 -0000	1.18
@@ -1,4 +1,4 @@
-d627a5d1061160c683f2257da498355b  abiword-2.6.0.tar.gz
-ebdc165d1b6c3c69f11148cf7841f257  abiword-plugins-2.6.0.tar.gz
-3daf3cbd59621fab0326512bf663d2d9  abiword-extras-2.6.0.tar.gz
-7403e74ee977e16fcaa7bcb24be16d23  abiword-docs-2.6.0.tar.gz
+01450e5389fdb7d36bc37c6d17091e5c  abiword-2.6.1.tar.gz
+1e2fc2a4d88d5f7408ada0607d9ae62a  abiword-docs-2.6.1.tar.gz
+589b34f80746883f46a9a77956400794  abiword-extras-2.6.1.tar.gz
+7e5bd0eb1777bd5420ae1d446d3b25ca  abiword-plugins-2.6.1.tar.gz


--- abiword-2.6.0-textbox.patch DELETED ---


--- abiword-extras-2.6.0-destdir.patch DELETED ---


--- abiword-plugins-2.6.0-no-libboost-thread.patch DELETED ---


--- abiword-plugins-2.6.0-regression.patch DELETED ---


--- abiword-plugins-2.6.0-xmpp.patch DELETED ---


--- nextgen.sh DELETED ---


