From 81ec847be7fbbe838092c0b17f9173cfc0924252 Mon Sep 17 00:00:00 2001
From: Marc Maurer <uwog@fedoraproject.org>
Date: Aug 02 2009 14:15:54 +0000
Subject: New upstream version


---

diff --git a/.cvsignore b/.cvsignore
index a08c593..538696b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-abiword-2.7.7.tar.gz
-abiword-docs-2.7.7.tar.gz
+abiword-2.7.8.tar.gz
+abiword-docs-2.7.8.tar.gz
diff --git a/abiword-2.7.7-templates.patch b/abiword-2.7.7-templates.patch
deleted file mode 100644
index 58607d9..0000000
--- a/abiword-2.7.7-templates.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -u -r abiword-2.7.7.orig/user/wp/templates/Makefile.am abiword-2.7.7/user/wp/templates/Makefile.am
---- abiword-2.7.7.orig/user/wp/templates/Makefile.am	2009-07-09 16:08:15.000000000 +0200
-+++ abiword-2.7.7/user/wp/templates/Makefile.am	2009-07-19 18:23:40.000000000 +0200
-@@ -1,6 +1,5 @@
- 
--templatesdir = $(ABIWORD_DATADIR)/templates
--templates_DATA = \
-+templates_normal = \
- 	normal.awt \
- 	normal.awt-am_ET \
- 	normal.awt-ar \
-@@ -63,8 +62,7 @@
- 	normal.awt-zh_CN \
- 	normal.awt-zh_TW
- 
--if ENABLE_TEMPLATES
--templates_DATA += \
-+templates_extra = \
- 	A4.awt \
- 	Business-Letter.awt \
- 	Business-Report.awt \
-@@ -76,7 +74,12 @@
- 	Resume.awt \
- 	Two-Columns.awt \
- 	US-Letter.awt
-+
-+templatesdir = $(ABIWORD_DATADIR)/templates
-+templates_DATA = $(templates_normal)
-+if ENABLE_TEMPLATES
-+templates_DATA += $(templates_extra)
- endif
- 
--EXTRA_DIST = $(templates_DATA)
-+EXTRA_DIST = $(templates_normal) $(templates_extra)
- 
diff --git a/abiword.spec b/abiword.spec
index ae147cd..80fb5f9 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -1,13 +1,13 @@
 %define majorversion 2
 %define minorversion 7
-%define microversion 7
+%define microversion 8
 
 %define olpc_build 0
 
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -30,7 +30,6 @@ Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.7.6-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-plugins-2.6.0-boolean.patch
-Patch4: abiword-2.7.7-templates.patch
 %if %{olpc_build}
 Patch100: abiword-2.6.4-defaultfont.patch
 Patch101: abiword-2.6.4-draghandles.patch
@@ -85,7 +84,6 @@ Includes and definitions for developing with libabiword.
 %if 0%{?fedora} >= 9
 %patch2 -p1 -b .boolean
 %endif
-%patch4 -p1 -b .templates
 %if %{olpc_build}
 %patch100 -p1 -b .defaultfont
 %patch101 -p1 -b .draghandles
@@ -181,6 +179,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Sun Aug 02 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.8-1
+- New upstream version
+
+* Mon Jul 27 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.7-3
+- Rerun autogen.sh after changing the makefiles
+
 * Mon Jul 27 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.7-2
 - Add a patch to work around a templates makefile bug
 
diff --git a/sources b/sources
index 9d53793..f90f639 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-31acd0e4775925acd867842bb61a301f  abiword-2.7.7.tar.gz
-7ae7c45e74d9287010fb6b342393e43d  abiword-docs-2.7.7.tar.gz
+cf6df9b80015080c7b26cec10217917b  abiword-2.7.8.tar.gz
+a84537df3879bf09bf81d9e40dd3e5bd  abiword-docs-2.7.8.tar.gz