From e134729b0836de0e0cc00e46a15a3bf0db0e292e Mon Sep 17 00:00:00 2001
From: Marc Maurer <uwog@fedoraproject.org>
Date: Sep 10 2005 09:29:50 +0000
Subject: 2.3.6 release


---

diff --git a/.cvsignore b/.cvsignore
index 4821545..8d5ec1a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-abiword-2.3.5.tar.bz2
+abiword-2.3.6.tar.bz2
diff --git a/abiword-2.3.4-pangographics.patch b/abiword-2.3.4-pangographics.patch
deleted file mode 100644
index 61cf60c..0000000
--- a/abiword-2.3.4-pangographics.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --recursive -Nau abiword-2.3.4.orig/abi/src/af/gr/unix/GNUmakefile.am abiword-2.3.4/abi/src/af/gr/unix/GNUmakefile.am
---- abiword-2.3.4.orig/abi/src/af/gr/unix/GNUmakefile.am	2005-03-20 18:41:14.000000000 +0100
-+++ abiword-2.3.4/abi/src/af/gr/unix/GNUmakefile.am	2005-08-19 15:20:28.000000000 +0200
-@@ -24,6 +24,5 @@
- 
- libGr_unix_a_SOURCES=\
- 	gr_UnixGraphics.cpp	\
--	gr_UnixImage.cpp \
--	gr_UnixPangoGraphics.cpp
-+	gr_UnixImage.cpp
- 
-diff --recursive -Nau abiword-2.3.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.3.4/abi/src/af/xap/unix/xap_UnixApp.cpp
---- abiword-2.3.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp	2005-07-05 16:08:20.000000000 +0200
-+++ abiword-2.3.4/abi/src/af/xap/unix/xap_UnixApp.cpp	2005-08-19 16:04:00.000000000 +0200
-@@ -107,7 +107,7 @@
- 
- 		
- 		UT_ASSERT( bSuccess );
--#if 1
-+#if 0
- 		bSuccess = pGF->registerClass(GR_UnixPangoGraphics::graphicsAllocator,
- 									  GR_UnixPangoGraphics::graphicsDescriptor,
- 									  GR_UnixPangoGraphics::s_getClassId());
diff --git a/abiword.spec b/abiword.spec
index 91d13ba..3c93950 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.3.5
-Release: 3
+Version: 2.3.6
+Release: 1
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -42,7 +42,6 @@ URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.2.6-desktop.patch
-Patch2: abiword-2.3.4-pangographics.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,7 +51,6 @@ AbiWord full-featured, and remain lean.
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .pangographics
 
 %build
 cd abi
@@ -133,6 +131,10 @@ update-desktop-database %{_datadir}/applications
 %{_datadir}/icons/*png
 
 %changelog
+* Sat Sep 10 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.6-1
+- Update to 2.3.6
+- Drop the pango patch
+
 * Sat Sep 3 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.5-3
 - Rebuild
 
diff --git a/sources b/sources
index dd7e46d..2f803a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b2f2b5f5379b6dd7fe4145b3f7a28d4  abiword-2.3.5.tar.bz2
+8a1fc6a2a9cec61ed15231d2fa1b3110  abiword-2.3.6.tar.bz2