From 3842f7bc05983a5a9d8f326f452a944334c6a41c Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 5 Jan 2015 09:59:05 +0000
Subject: [PATCH 01/86] drop patches not needed for F-20

---
 abiword-3.0.0-librevenge.patch            | 1185 ---------------------
 abiword-3.0.0-link-grammar-5-second.patch |   35 -
 abiword-3.0.0-link-grammar-5.patch        |   45 -
 abiword.spec                              |    7 -
 4 files changed, 1272 deletions(-)
 delete mode 100644 abiword-3.0.0-librevenge.patch
 delete mode 100644 abiword-3.0.0-link-grammar-5-second.patch
 delete mode 100644 abiword-3.0.0-link-grammar-5.patch

diff --git a/abiword-3.0.0-librevenge.patch b/abiword-3.0.0-librevenge.patch
deleted file mode 100644
index d85cb1e..0000000
--- a/abiword-3.0.0-librevenge.patch
+++ /dev/null
@@ -1,1185 +0,0 @@
-Index: plugins/wpg/xp/ie_impGraphic_WPG.cpp
-===================================================================
---- plugins/wpg/xp/ie_impGraphic_WPG.cpp	(revision 34460)
-+++ plugins/wpg/xp/ie_impGraphic_WPG.cpp	(working copy)
-@@ -31,7 +31,7 @@
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
- #include <gsf/gsf-infile-msole.h>
--#include <libwpd-stream/libwpd-stream.h>
-+#include <librevenge-0.0/librevenge-stream/librevenge-stream.h>
- #include "xap_Module.h"
- 
- using libwpg::WPGraphics;
-@@ -38,30 +38,35 @@
- 
- ABI_PLUGIN_DECLARE("WPG")
- 
--class AbiWordPerfectGraphicsInputStream : public WPXInputStream
-+class AbiWordPerfectGraphicsInputStream : public librevenge::RVNGInputStream
- {
- public:
- 	AbiWordPerfectGraphicsInputStream(GsfInput *input);
- 	~AbiWordPerfectGraphicsInputStream();
- 
--	virtual bool isOLEStream();
--	virtual WPXInputStream * getDocumentOLEStream();
--	virtual WPXInputStream * getDocumentOLEStream(const char * name);
-+	virtual bool isStructured();
-+	virtual unsigned subStreamCount();
-+	virtual const char* subStreamName(unsigned);
-+	bool existsSubStream(const char*);
-+	virtual librevenge::RVNGInputStream* getSubStreamByName(const char*);
-+	virtual librevenge::RVNGInputStream* getSubStreamById(unsigned);
- 	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
--	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
-+	virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
- 	virtual long tell();
--	virtual bool atEOS();
-+	virtual bool isEnd();
- 
- private:
- 
- 	GsfInput *m_input;
- 	GsfInfile *m_ole;
-+	std::map<unsigned, std::string> m_substreams;
- };
- 
- AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
--	WPXInputStream(),
-+	librevenge::RVNGInputStream(),
- 	m_input(input),
--	m_ole(NULL)
-+	m_ole(NULL),
-+	m_substreams()
- {
- 	g_object_ref(G_OBJECT(input));
- }
-@@ -86,50 +91,120 @@
- 	return buf;
- }
- 
--int AbiWordPerfectGraphicsInputStream::seek(long offset, WPX_SEEK_TYPE seekType) 
-+int AbiWordPerfectGraphicsInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) 
- {
- 	GSeekType gsfSeekType = G_SEEK_SET;
- 	switch(seekType)
- 	{
--	case WPX_SEEK_CUR:
-+	case librevenge::RVNG_SEEK_CUR:
- 		gsfSeekType = G_SEEK_CUR;
- 		break;
--	case WPX_SEEK_SET:
-+	case librevenge::RVNG_SEEK_SET:
- 		gsfSeekType = G_SEEK_SET;
- 		break;
-+	case librevenge::RVNG_SEEK_END:
-+		gsfSeekType = G_SEEK_END;
-+		break;
- 	}
- 
- 	return gsf_input_seek(m_input, offset, gsfSeekType);
- }
- 
--bool AbiWordPerfectGraphicsInputStream::isOLEStream()
-+bool AbiWordPerfectGraphicsInputStream::isStructured()
- {
- 	if (!m_ole)
- 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 
--	if (m_ole != NULL)
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
- 		return true;
- 
- 	return false;
- }
- 
--WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream()
-+unsigned AbiWordPerfectGraphicsInputStream::subStreamCount()
- {
--	return getDocumentOLEStream("PerfectOffice_MAIN");
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			int numChildren = gsf_infile_num_children(m_ole);
-+			if (numChildren > 0)
-+				return numChildren;
-+			return 0;
-+		}
-+	
-+	return 0;
- }
- 
--WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream(const char * name)
-+const char * AbiWordPerfectGraphicsInputStream::subStreamName(unsigned id)
- {
--	WPXInputStream *documentStream = NULL;
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 	
- 	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			if ((int)id >= gsf_infile_num_children(m_ole))
-+			{
-+				return 0;
-+			}
-+			std::map<unsigned, std::string>::iterator i = m_substreams.lower_bound(id);
-+			if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first))
-+				{
-+					std::string name = gsf_infile_name_by_index(m_ole, (int)id);
-+					i = m_substreams.insert(i, std::map<unsigned, std::string>::value_type(id, name));
-+				}
-+			return i->second.c_str();
-+		}
-+	
-+	return 0;
-+}
-+
-+bool AbiWordPerfectGraphicsInputStream::existsSubStream(const char * name)
-+{
-+	if (!m_ole)
- 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
- 	if (m_ole)
- 		{
- 			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
- 			if (document) 
- 				{
-+					g_object_unref(G_OBJECT (document));
-+					return true;
-+				}
-+		}
-+	
-+	return false;
-+}
-+
-+librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamByName(const char * name)
-+{
-+	librevenge::RVNGInputStream *documentStream = NULL;
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
-+			if (document) 
-+				{
- 					documentStream = new AbiWordPerfectGraphicsInputStream(document);
- 					g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
- 				}
-@@ -138,12 +213,35 @@
- 	return documentStream;
- }
- 
-+librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamById(unsigned id)
-+{
-+	librevenge::RVNGInputStream *documentStream = NULL;
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id);
-+			if (document) 
-+				{
-+					documentStream = new AbiWordPerfectGraphicsInputStream(document);
-+					g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
-+				}
-+		}
-+	
-+	return documentStream;
-+}
-+
- long AbiWordPerfectGraphicsInputStream::tell()
- {
- 	return gsf_input_tell(m_input);
- }
- 
--bool AbiWordPerfectGraphicsInputStream::atEOS()
-+bool AbiWordPerfectGraphicsInputStream::isEnd()
- {
- 	return gsf_input_eof(m_input);
- }
-@@ -244,14 +342,24 @@
- UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
- {
- 	AbiWordPerfectGraphicsInputStream gsfInput(input);
--	WPXString svgOutput;
--	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
-+	librevenge::RVNGString svgOutput;
-+	librevenge::RVNGStringVector vec;
-+	librevenge::RVNGSVGDrawingGenerator generator(vec, "");
-+
-+	if (!libwpg::WPGraphics::parse(&gsfInput, &generator) || vec.empty() || vec[0].empty())
- 	{
--		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
--		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
--		g_object_unref(svgInput);
--		return result;
-+		return UT_ERROR;
- 	}
--	return UT_ERROR;
-+
-+	svgOutput.append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
-+	svgOutput.append("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"");
-+	svgOutput.append(" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
-+	svgOutput.append(vec[0]);
-+	svgOutput.append("\n");
-+
-+	GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
-+	UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
-+	g_object_unref(svgInput);
-+	return result;
- }
- 
-Index: plugins/wpg/plugin.m4
-===================================================================
---- plugins/wpg/plugin.m4	(revision 34460)
-+++ plugins/wpg/plugin.m4	(working copy)
-@@ -1,5 +1,5 @@
- 
--wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
-+wpg_pkgs="libwpg-0.3 $gsf_req"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-Index: plugins/wordperfect/xp/ie_imp_WordPerfect.h
-===================================================================
---- plugins/wordperfect/xp/ie_imp_WordPerfect.h	(revision 34460)
-+++ plugins/wordperfect/xp/ie_imp_WordPerfect.h	(working copy)
-@@ -30,7 +30,7 @@
- #define IE_IMP_WP_H
- 
- #include <stdio.h>
--#include <libwpd/libwpd.h>
-+#include <librevenge-0.0/librevenge/librevenge.h>
- #include "ie_imp.h"
- #include "ut_string.h"
- #include "ut_string_class.h"
-@@ -92,7 +92,7 @@
- 					IE_Imp ** ppie);
- };
- 
--class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
-+class IE_Imp_WordPerfect : public IE_Imp, public librevenge::RVNGTextInterface
- {
- public:
-     IE_Imp_WordPerfect(PD_Document * pDocument);
-@@ -101,69 +101,83 @@
-     virtual void pasteFromBuffer(PD_DocumentRange * pDocRange,
- 				 UT_uint8 * pData, UT_uint32 lenData, const char * szEncoding = 0);
- 
--    virtual void setDocumentMetaData(const WPXPropertyList &propList);
-+	virtual void setDocumentMetaData(const librevenge::RVNGPropertyList &propList);
- 
--    virtual void startDocument();
--    virtual void endDocument();
-+	virtual void startDocument(const librevenge::RVNGPropertyList &propList);
-+	virtual void endDocument();
- 
--    virtual void openPageSpan(const WPXPropertyList &propList);
--    virtual void closePageSpan() {}
--    virtual void openHeader(const WPXPropertyList &propList);
--    virtual void closeHeader();
--    virtual void openFooter(const WPXPropertyList &propList);
--    virtual void closeFooter();
-+	virtual void defineEmbeddedFont(const librevenge::RVNGPropertyList & /* propList */) {}
- 
--    virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
--    virtual void closeParagraph() {}
-+	virtual void definePageStyle(const librevenge::RVNGPropertyList &) {}
-+	virtual void openPageSpan(const librevenge::RVNGPropertyList &propList);
-+	virtual void closePageSpan() {}
-+	virtual void openHeader(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeHeader();
-+	virtual void openFooter(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeFooter();
- 
--    virtual void openSpan(const WPXPropertyList &propList);
--    virtual void closeSpan() {}
-+	virtual void defineSectionStyle(const librevenge::RVNGPropertyList &) {}
-+	virtual void openSection(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeSection() {}
- 
--    virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
--    virtual void closeSection() {}
-+	virtual void defineParagraphStyle(const librevenge::RVNGPropertyList &) {}
-+	virtual void openParagraph(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeParagraph() {}
- 
--    virtual void insertTab();
--    virtual void insertText(const WPXString &text);
--    virtual void insertLineBreak();
-+	virtual void defineCharacterStyle(const librevenge::RVNGPropertyList &) {}
-+	virtual void openSpan(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeSpan() {}
- 
--    virtual void defineOrderedListLevel(const WPXPropertyList &propList);
--    virtual void defineUnorderedListLevel(const WPXPropertyList &propList);
--    virtual void openOrderedListLevel(const WPXPropertyList &propList);
--    virtual void openUnorderedListLevel(const WPXPropertyList &propList);
--    virtual void closeOrderedListLevel();
--    virtual void closeUnorderedListLevel();
--    virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
--    virtual void closeListElement() {}
-+	virtual void openLink(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeLink() {}
- 
--    virtual void openFootnote(const WPXPropertyList &propList);
--    virtual void closeFootnote();
--    virtual void openEndnote(const WPXPropertyList &propList);
--    virtual void closeEndnote();
-+	virtual void insertTab();
-+	virtual void insertText(const librevenge::RVNGString &text);
-+	virtual void insertSpace();
-+	virtual void insertLineBreak();
-+	virtual void insertField(const librevenge::RVNGPropertyList & /* propList */) {}
- 
--    virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
--    virtual void openTableRow(const WPXPropertyList &propList);
--    virtual void closeTableRow() {}
--    virtual void openTableCell(const WPXPropertyList &propList);
--    virtual void closeTableCell() {}
--    virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
--    virtual void closeTable();
-+	virtual void openOrderedListLevel(const librevenge::RVNGPropertyList &propList);
-+	virtual void openUnorderedListLevel(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeOrderedListLevel();
-+	virtual void closeUnorderedListLevel();
-+	virtual void openListElement(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeListElement() {}
- 
--    virtual void definePageStyle(const WPXPropertyList&) {}
--    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
--    virtual void defineCharacterStyle(const WPXPropertyList&) {}
--    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
--    virtual void insertSpace() {}
--    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
--    virtual void openComment(const WPXPropertyList&) {}
--    virtual void closeComment() {}
--    virtual void openTextBox(const WPXPropertyList&) {}
--    virtual void closeTextBox() {}
--    virtual void openFrame(const WPXPropertyList&) {}
--    virtual void closeFrame() {}
--    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
--    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
-+	virtual void openFootnote(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeFootnote();
-+	virtual void openEndnote(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeEndnote();
-+	virtual void openComment(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeComment() {}
-+	virtual void openTextBox(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeTextBox() {}
- 
-+	virtual void openTable(const librevenge::RVNGPropertyList &propList);
-+	virtual void openTableRow(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeTableRow() {}
-+	virtual void openTableCell(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeTableCell() {}
-+	virtual void insertCoveredTableCell(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeTable();
- 
-+	virtual void openFrame(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeFrame() {}
-+
-+	virtual void openGroup(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeGroup() {}
-+
-+	virtual void defineGraphicStyle(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawRectangle(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawEllipse(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawPolygon(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawPolyline(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawPath(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawConnector(const librevenge::RVNGPropertyList & /* propList */) {}
-+
-+	virtual void insertBinaryObject(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void insertEquation(const librevenge::RVNGPropertyList & /* propList */) {}
-+
- protected:
- 	virtual UT_Error _loadFile(GsfInput * input);
-     UT_Error							_appendSection(int numColumns, const float, const float);
-Index: plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp
-===================================================================
---- plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp	(revision 34460)
-+++ plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp	(working copy)
-@@ -35,7 +35,6 @@
- ABI_PLUGIN_DECLARE("WordPerfect")
- 
- static IE_Imp_WordPerfect_Sniffer * m_ImpSniffer = 0;
--static IE_Exp_WordPerfect_Sniffer * m_ExpSniffer = 0;
- 
- #ifdef HAVE_LIBWPS
- static IE_Imp_MSWorks_Sniffer * m_MSWorks_ImpSniffer = 0;
-@@ -49,13 +48,7 @@
- 		m_ImpSniffer = new IE_Imp_WordPerfect_Sniffer ();
- 	}
- 
--	if (!m_ExpSniffer)
--	{
--		m_ExpSniffer = new IE_Exp_WordPerfect_Sniffer ();
--	}
--
- 	UT_ASSERT (m_ImpSniffer);
--	UT_ASSERT (m_ExpSniffer);
- 
- #ifdef HAVE_LIBWPS
- 	if (!m_MSWorks_ImpSniffer)
-@@ -79,7 +72,7 @@
- 	mi->usage   = "No Usage";
- 
- 	IE_Imp::registerImporter (m_ImpSniffer);
--	//IE_Exp::registerExporter (m_ExpSniffer);
-+
- 	return 1;
- }
- 
-@@ -93,18 +86,11 @@
- 	mi->usage   = 0;
- 
- 	UT_ASSERT (m_ImpSniffer);
--	UT_ASSERT (m_ExpSniffer);
- 
- 	IE_Imp::unregisterImporter (m_ImpSniffer);
- 	delete m_ImpSniffer;
- 	m_ImpSniffer = 0;
- 	
--	/*
--	IE_Exp::unregisterExporter (m_ExpSniffer);
--	delete m_ExpSniffer;
--	m_ExpSniffer = 0;
--	*/
--
- #ifdef HAVE_LIBWPS
- 	IE_Imp::unregisterImporter (m_MSWorks_ImpSniffer);
- 	delete m_MSWorks_ImpSniffer;
-Index: plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
-===================================================================
---- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	(revision 34460)
-+++ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	(working copy)
-@@ -31,6 +31,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-+#include <map>
-+#include <string>
- #include <gsf/gsf-utils.h>
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
-@@ -60,42 +62,47 @@
- 
- // Stream class
- 
--#include <libwpd-stream/libwpd-stream.h>
-+#include <librevenge-0.0/librevenge-stream/librevenge-stream.h>
-+#include <libwpd/libwpd.h>
- 
- #include <gsf/gsf-input.h>
- #include <gsf/gsf-infile.h>
- #include <gsf/gsf-infile-msole.h>
-+#include <gsf/gsf-infile-zip.h>
- 
- #ifdef HAVE_LIBWPS
- #include <libwps/libwps.h>
- #endif
- 
--class AbiWordperfectInputStream : public WPXInputStream
-+class AbiWordperfectInputStream : public librevenge::RVNGInputStream
- {
- public:
- 	AbiWordperfectInputStream(GsfInput *input);
- 	~AbiWordperfectInputStream();
- 
--	virtual bool isOLEStream();
--	virtual WPXInputStream * getDocumentOLEStream();
--
--	virtual WPXInputStream * getDocumentOLEStream(const char * name);
--
-+	virtual bool isStructured();
-+	virtual unsigned subStreamCount();
-+	virtual const char* subStreamName(unsigned);
-+	bool existsSubStream(const char*);
-+	virtual librevenge::RVNGInputStream* getSubStreamByName(const char*);
-+	virtual librevenge::RVNGInputStream* getSubStreamById(unsigned);
- 	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
--	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
-+	virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
- 	virtual long tell();
--	virtual bool atEOS();
-+	virtual bool isEnd();
- 
- private:
- 
- 	GsfInput *m_input;
- 	GsfInfile *m_ole;
-+	std::map<unsigned, std::string> m_substreams;
- };
- 
- AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
--	WPXInputStream(),
-+	librevenge::RVNGInputStream(),
- 	m_input(input),
--	m_ole(NULL)
-+	m_ole(NULL),
-+	m_substreams()
- {
- 	g_object_ref(G_OBJECT(input));
- }
-@@ -120,50 +127,120 @@
- 	return buf;
- }
- 
--int AbiWordperfectInputStream::seek(long offset, WPX_SEEK_TYPE seekType) 
-+int AbiWordperfectInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) 
- {
- 	GSeekType gsfSeekType = G_SEEK_SET;
- 	switch(seekType)
- 	{
--	case WPX_SEEK_CUR:
-+	case librevenge::RVNG_SEEK_CUR:
- 		gsfSeekType = G_SEEK_CUR;
- 		break;
--	case WPX_SEEK_SET:
-+	case librevenge::RVNG_SEEK_SET:
- 		gsfSeekType = G_SEEK_SET;
- 		break;
-+	case librevenge::RVNG_SEEK_END:
-+		gsfSeekType = G_SEEK_END;
-+		break;
- 	}
- 
- 	return gsf_input_seek(m_input, offset, gsfSeekType);
- }
- 
--bool AbiWordperfectInputStream::isOLEStream()
-+bool AbiWordperfectInputStream::isStructured()
- {
- 	if (!m_ole)
- 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 
--	if (m_ole != NULL)
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
- 		return true;
- 
- 	return false;
- }
- 
--WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream()
-+unsigned AbiWordperfectInputStream::subStreamCount()
- {
--	return getDocumentOLEStream("PerfectOffice_MAIN");
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			int numChildren = gsf_infile_num_children(m_ole);
-+			if (numChildren > 0)
-+				return numChildren;
-+			return 0;
-+		}
-+	
-+	return 0;
- }
- 
--WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream(const char * name)
-+const char * AbiWordperfectInputStream::subStreamName(unsigned id)
- {
--	WPXInputStream *documentStream = NULL;
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 	
- 	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			if ((int)id >= gsf_infile_num_children(m_ole))
-+			{
-+				return 0;
-+			}
-+			std::map<unsigned, std::string>::iterator i = m_substreams.lower_bound(id);
-+			if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first))
-+				{
-+					std::string name = gsf_infile_name_by_index(m_ole, (int)id);
-+					i = m_substreams.insert(i, std::map<unsigned, std::string>::value_type(id, name));
-+				}
-+			return i->second.c_str();
-+		}
-+	
-+	return 0;
-+}
-+
-+bool AbiWordperfectInputStream::existsSubStream(const char * name)
-+{
-+	if (!m_ole)
- 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
- 	if (m_ole)
- 		{
- 			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
- 			if (document) 
- 				{
-+					g_object_unref(G_OBJECT (document));
-+					return true;
-+				}
-+		}
-+	
-+	return false;
-+}
-+
-+librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamByName(const char * name)
-+{
-+	librevenge::RVNGInputStream *documentStream = NULL;
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
-+			if (document) 
-+				{
- 					documentStream = new AbiWordperfectInputStream(document);
- 					g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
- 				}
-@@ -172,12 +249,35 @@
- 	return documentStream;
- }
- 
-+librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamById(unsigned id)
-+{
-+	librevenge::RVNGInputStream *documentStream = NULL;
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id);
-+			if (document) 
-+				{
-+					documentStream = new AbiWordperfectInputStream(document);
-+					g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
-+				}
-+		}
-+	
-+	return documentStream;
-+}
-+
- long AbiWordperfectInputStream::tell()
- {
- 	return gsf_input_tell(m_input);
- }
- 
--bool AbiWordperfectInputStream::atEOS()
-+bool AbiWordperfectInputStream::isEnd()
- {
- 	return gsf_input_eof(m_input);
- }
-@@ -247,13 +347,13 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
--
-+	libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(&gsfInput);
-+	
- 	switch (confidence)
- 	{
--		case WPD_CONFIDENCE_NONE:
-+		case libwpd::WPD_CONFIDENCE_NONE:
- 			return UT_CONFIDENCE_ZILCH;
--		case WPD_CONFIDENCE_EXCELLENT:
-+		case libwpd::WPD_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
- 			return UT_CONFIDENCE_ZILCH;
-@@ -312,9 +412,9 @@
- UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
- {
- 	AbiWordperfectInputStream gsfInput(input);
--	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
-+	libwpd::WPDResult error = libwpd::WPDocument::parse(&gsfInput, static_cast<librevenge::RVNGTextInterface *>(this), NULL);
- 
--	if (error != WPD_OK)
-+	if (error != libwpd::WPD_OK)
- 	{
- 		UT_DEBUGMSG(("AbiWordPerfect: ERROR: %i!\n", (int)error));
- 		return UT_IE_IMPORTERROR;
-@@ -329,7 +429,7 @@
- 	// nada
- }
- 
--void IE_Imp_WordPerfect::setDocumentMetaData(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::setDocumentMetaData(const librevenge::RVNGPropertyList &propList)
- {
- 	if (propList["dc:author"])
- 		getDoc()->setMetaDataProp(PD_META_KEY_CREATOR, propList["dc:author"]->getStr().cstr());
-@@ -339,15 +439,15 @@
- 		getDoc()->setMetaDataProp(PD_META_KEY_PUBLISHER, propList["dc:publisher"]->getStr().cstr());
- 	if (propList["dc:type"])
- 		getDoc()->setMetaDataProp(PD_META_KEY_TYPE, propList["dc:category"]->getStr().cstr());
--	if (propList["libwpd:keywords"])
--		getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["libwpd:keywords"]->getStr().cstr());
-+	if (propList["librevenge:keywords"])
-+		getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["librevenge:keywords"]->getStr().cstr());
- 	if (propList["dc:language"])
- 		getDoc()->setMetaDataProp(PD_META_KEY_LANGUAGE, propList["dc:language"]->getStr().cstr());
--	if (propList["libwpd:abstract"])
--		getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["libwpd:abstract"]->getStr().cstr());
-+	if (propList["librevenge:abstract"])
-+		getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["librevenge:abstract"]->getStr().cstr());
- }
- 
--void IE_Imp_WordPerfect::startDocument()
-+void IE_Imp_WordPerfect::startDocument(const librevenge::RVNGPropertyList & /* propList */)
- {
- 	UT_DEBUGMSG(("AbiWordPerfect: startDocument\n"));
- }
-@@ -357,7 +457,7 @@
- 	UT_DEBUGMSG(("AbiWordPerfect: endDocument\n"));
- }
- 
--void IE_Imp_WordPerfect::openPageSpan(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openPageSpan(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: openPageSpan\n"));
-@@ -378,7 +478,7 @@
- 		
- }
- 
--void IE_Imp_WordPerfect::openHeader(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openHeader(const librevenge::RVNGPropertyList & /*propList*/)
- {
- 	m_bHdrFtrOpenCount++;
- 	
-@@ -420,7 +520,7 @@
- 	*/
- }
- 
--void IE_Imp_WordPerfect::openFooter(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openFooter(const librevenge::RVNGPropertyList & /*propList*/)
- {
- 	m_bHdrFtrOpenCount++;
- 	// see above comments re: openHeader
-@@ -432,7 +532,7 @@
- 	// see above comments re: closeHeader
- }
- 
--void IE_Imp_WordPerfect::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
-+void IE_Imp_WordPerfect::openParagraph(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: openParagraph()\n"));
-@@ -478,13 +578,15 @@
- 		(int)(m_topMargin*72), (int)(m_bottomMargin*72), m_leftMarginOffset, m_rightMarginOffset, m_textIndent, lineSpacing);
- 	propBuffer += tmpBuffer;
- 	
--	if (tabStops.count() > 0) // Append the tabstop information
-+	const librevenge::RVNGPropertyListVector *tabStops = propList.child("style:tab-stops");
-+	
-+	if (tabStops && tabStops->count()) // Append the tabstop information
- 	{
- 		propBuffer += "; tabstops:";
- 		tmpBuffer = "";
--                WPXPropertyListVector::Iter i(tabStops);
--                for (i.rewind(); i.next();)
--                {
-+		librevenge::RVNGPropertyListVector::Iter i(*tabStops);
-+		for (i.rewind(); i.next();)
-+		{
- 			propBuffer += tmpBuffer;
- 			if (i()["style:position"])
- 			{
-@@ -515,8 +617,8 @@
- 				propBuffer += "0";
- 
- 			tmpBuffer = ",";
--                }
--        }
-+		}
-+	}
- 
- 	
- 
-@@ -543,7 +645,7 @@
- 	}
- }
- 
--void IE_Imp_WordPerfect::openSpan(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openSpan(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: Appending current text properties\n"));
-@@ -614,13 +716,14 @@
- 	X_CheckDocumentError(appendFmt(propsArray));
- }
- 
--void IE_Imp_WordPerfect::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
-+void IE_Imp_WordPerfect::openSection(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: openSection\n"));
- 
- 	float marginLeft = 0.0f, marginRight = 0.0f;
--	int columnsCount = ((columns.count() == 0) ? 1 : columns.count());
-+	const librevenge::RVNGPropertyListVector *columns = propList.child("style:columns");
-+	int columnsCount = ((!columns || !columns->count()) ? 1 : columns->count());
- 
- 	// TODO: support spaceAfter
- 	if (propList["fo:start-indent"])
-@@ -647,7 +750,7 @@
- 	X_CheckDocumentError(appendSpan(&ucs,1));	
- }
- 
--void IE_Imp_WordPerfect::insertText(const WPXString &text)
-+void IE_Imp_WordPerfect::insertText(const librevenge::RVNGString &text)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	if (text.len())
-@@ -658,6 +761,15 @@
- 	}
- }
- 
-+void IE_Imp_WordPerfect::insertSpace()
-+{
-+	if (m_bHdrFtrOpenCount) return; // HACK
-+	UT_DEBUGMSG(("AbiWordPerfect: insertSpace\n"));
-+
-+	UT_UCS4Char ucs = UCS_SPACE;
-+	X_CheckDocumentError(appendSpan(&ucs,1));	
-+}
-+
- void IE_Imp_WordPerfect::insertLineBreak()
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
-@@ -668,12 +780,11 @@
- }
- 
- 
--
--void IE_Imp_WordPerfect::defineOrderedListLevel(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openOrderedListLevel(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
--	UT_DEBUGMSG(("AbiWordPerfect: defineOrderedListLevel\n"));
--
-+	UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n"));
-+	
- 	int listID = 0, startingNumber = 0, level = 1;
- 	char listType = '1';
- 	UT_UTF8String textBeforeNumber, textAfterNumber;
-@@ -680,12 +791,12 @@
- 	float listLeftOffset = 0.0f;
- 	float listMinLabelWidth = 0.0f;
- 	
--	if (propList["libwpd:id"])
--		listID = propList["libwpd:id"]->getInt();
-+	if (propList["librevenge:id"])
-+		listID = propList["librevenge:id"]->getInt();
- 	if (propList["text:start-value"])
- 		startingNumber = propList["text:start-value"]->getInt();
--	if (propList["libwpd:level"])
--		level = propList["libwpd:level"]->getInt();
-+	if (propList["librevenge:level"])
-+		level = propList["librevenge:level"]->getInt();
- 	if (propList["style:num-prefix"])
- 		textBeforeNumber += propList["style:num-prefix"]->getStr().cstr();
- 	if (propList["style:num-suffix"])
-@@ -716,22 +827,38 @@
- 		m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth);
- 		_updateDocumentOrderedListDefinition(m_pCurrentListDefinition, level, listType, textBeforeNumber, textAfterNumber, startingNumber);
- 	}
-+
-+	m_iCurrentListLevel++;
- }
- 
--void IE_Imp_WordPerfect::defineUnorderedListLevel(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::closeOrderedListLevel()
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
--	UT_DEBUGMSG(("AbiWordPerfect: defineUnorderedListLevel\n"));
-+	UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel));
-+	UT_ASSERT(m_iCurrentListLevel > 0); 
-+	
-+	// every time we close a list level, the level above it is normally renumbered to start at "1"
-+	// again. this code takes care of that.
-+	if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1))
-+		m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0);
-+	
-+	m_iCurrentListLevel--;
-+}
- 
-+void IE_Imp_WordPerfect::openUnorderedListLevel(const librevenge::RVNGPropertyList &propList)
-+{
-+	if (m_bHdrFtrOpenCount) return; // HACK
-+	UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n"));
-+	
- 	int listID = 0, level = 1;
--	WPXString textBeforeNumber, textAfterNumber;
-+	librevenge::RVNGString textBeforeNumber, textAfterNumber;
- 	float listLeftOffset = 0.0f;
- 	float listMinLabelWidth = 0.0f;
- 	
--	if (propList["libwpd:id"])
--		listID = propList["libwpd:id"]->getInt();
--	if (propList["libwpd:level"])
--		level = propList["libwpd:level"]->getInt();
-+	if (propList["librevenge:id"])
-+		listID = propList["librevenge:id"]->getInt();
-+	if (propList["librevenge:level"])
-+		level = propList["librevenge:level"]->getInt();
- 	if (propList["text:space-before"])
- 		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
-@@ -752,39 +879,10 @@
- 		m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth);
- 		_updateDocumentUnorderedListDefinition(m_pCurrentListDefinition, level);
- 	}
--}
- 
--//void IE_Imp_WordPerfect::openOrderedListLevel(const int listID)
--void IE_Imp_WordPerfect::openOrderedListLevel(const WPXPropertyList & /*propList*/)
--{
--	if (m_bHdrFtrOpenCount) return; // HACK
--	UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n"));
--	
- 	m_iCurrentListLevel++;
- }
- 
--void IE_Imp_WordPerfect::closeOrderedListLevel()
--{
--	if (m_bHdrFtrOpenCount) return; // HACK
--	UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel));
--	UT_ASSERT(m_iCurrentListLevel > 0); 
--	
--	// every time we close a list level, the level above it is normally renumbered to start at "1"
--	// again. this code takes care of that.
--	if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1))
--		m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0);
--	
--	m_iCurrentListLevel--;
--}
--
--void IE_Imp_WordPerfect::openUnorderedListLevel(const WPXPropertyList & /*propList*/)
--{
--	if (m_bHdrFtrOpenCount) return; // HACK
--	UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n"));
--	
--	m_iCurrentListLevel++;
--}
--
- void IE_Imp_WordPerfect::closeUnorderedListLevel()
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
-@@ -796,7 +894,7 @@
- 
- // ASSUMPTION: We assume that unordered lists will always pass a number of "0". unpredictable behaviour
- // may result otherwise
--void IE_Imp_WordPerfect::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector & /*tabStops*/)
-+void IE_Imp_WordPerfect::openListElement(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: openListElement\n"));
-@@ -885,7 +983,7 @@
- 	X_CheckDocumentError(appendSpan(&ucs,1));
- }
- 
--void IE_Imp_WordPerfect::openFootnote(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openFootnote(const librevenge::RVNGPropertyList & /*propList*/)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 
-@@ -934,7 +1032,7 @@
- 	X_CheckDocumentError(appendStrux(PTX_EndFootnote,NULL));
- }
- 
--void IE_Imp_WordPerfect::openEndnote(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openEndnote(const librevenge::RVNGPropertyList & /*propList*/)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	const gchar** propsArray = NULL;
-@@ -975,7 +1073,7 @@
- 	X_CheckDocumentError(appendStrux(PTX_EndEndnote,NULL));
- }
- 
--void IE_Imp_WordPerfect::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
-+void IE_Imp_WordPerfect::openTable(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	// TODO: handle 'marginLeftOffset' and 'marginRightOffset'
-@@ -1000,14 +1098,18 @@
- 		}
- 	}
- 	
--	propBuffer += "table-column-props:";
--	WPXPropertyListVector::Iter i(columns);
--	for (i.rewind(); i.next();)
-+	const librevenge::RVNGPropertyListVector *columns = propList.child("librevenge:table-columns");
-+	if (columns)
- 	{
--		UT_String tmpBuffer;
--		if (i()["style:column-width"])
--			UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr());
--		propBuffer += tmpBuffer;
-+		propBuffer += "table-column-props:";
-+		librevenge::RVNGPropertyListVector::Iter i(*columns);
-+		for (i.rewind(); i.next();)
-+		{
-+			UT_String tmpBuffer;
-+			if (i()["style:column-width"])
-+				UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr());
-+			propBuffer += tmpBuffer;
-+		}
- 	}
- 
- 	const gchar* propsArray[3];
-@@ -1018,7 +1120,7 @@
- 	X_CheckDocumentError(appendStrux(PTX_SectionTable, propsArray));
- }
- 
--void IE_Imp_WordPerfect::openTableRow(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openTableRow(const librevenge::RVNGPropertyList & /*propList*/)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: openRow\n"));
-@@ -1030,14 +1132,14 @@
- 	m_bInCell = false;
- }
- 
--void IE_Imp_WordPerfect::openTableCell(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openTableCell(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	int col =0,  row = 0, colSpan = 0, rowSpan = 0;
--	if (propList["libwpd:column"])
--		col = propList["libwpd:column"]->getInt();
--	if (propList["libwpd:row"])
--		row = propList["libwpd:row"]->getInt();
-+	if (propList["librevenge:column"])
-+		col = propList["librevenge:column"]->getInt();
-+	if (propList["librevenge:row"])
-+		row = propList["librevenge:row"]->getInt();
- 	if (propList["table:number-columns-spanned"])
- 		colSpan = propList["table:number-columns-spanned"]->getInt();
- 	if (propList["table:number-rows-spanned"])
-@@ -1247,9 +1349,9 @@
-     virtual UT_Error _loadFile(GsfInput * input)
- 	{
- 		AbiWordperfectInputStream gsfInput(input);
--		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
-+		libwps::WPSResult error = libwps::WPSDocument::parse(&gsfInput, static_cast<librevenge::RVNGTextInterface *>(this));
- 
--		if (error != WPS_OK)
-+		if (error != libwps::WPS_OK)
- 			{
- 				UT_DEBUGMSG(("AbiMSWorks: ERROR: %i!\n", (int)error));
- 				return UT_IE_IMPORTERROR;
-@@ -1286,13 +1388,17 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
-+	libwps::WPSKind kind;
-+	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
-+	
-+	if (kind != libwps::WPS_TEXT)
-+		confidence = libwps::WPS_CONFIDENCE_NONE;
- 
- 	switch (confidence)
- 	{
--		case WPS_CONFIDENCE_NONE:
-+		case libwps::WPS_CONFIDENCE_NONE:
- 			return UT_CONFIDENCE_ZILCH;
--		case WPS_CONFIDENCE_EXCELLENT:
-+		case libwps::WPS_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
- 			return UT_CONFIDENCE_ZILCH;
-Index: plugins/wordperfect/xp/Makefile.am
-===================================================================
---- plugins/wordperfect/xp/Makefile.am	(revision 34460)
-+++ plugins/wordperfect/xp/Makefile.am	(working copy)
-@@ -6,8 +6,6 @@
- 	-DABI_BUILD_VERSION=\"$(VERSION)\"
- 
- libxp_la_SOURCES = \
--	ie_exp_WordPerfect.cpp \
--	ie_exp_WordPerfect.h \
- 	ie_impexp_WordPerfect.cpp \
- 	ie_impexp_WordPerfect.h \
- 	ie_imp_WordPerfect.cpp \
-Index: plugins/wordperfect/xp/ie_impexp_WordPerfect.h
-===================================================================
---- plugins/wordperfect/xp/ie_impexp_WordPerfect.h	(revision 34460)
-+++ plugins/wordperfect/xp/ie_impexp_WordPerfect.h	(working copy)
-@@ -24,7 +24,6 @@
-  */
- 
- #include "ie_imp_WordPerfect.h"
--#include "ie_exp_WordPerfect.h"
- #include "xap_Module.h"
- 
- #define IE_MIMETYPE_WP_51			"application/wordperfect5.1"
-Index: plugins/wordperfect/plugin.m4
-===================================================================
---- plugins/wordperfect/plugin.m4	(revision 34460)
-+++ plugins/wordperfect/plugin.m4	(working copy)
-@@ -1,6 +1,6 @@
- 
--wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
-+wordperfect_pkgs="libwpd-0.10 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.3'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-@@ -29,7 +29,7 @@
- 
- PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ],
- [
--	wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs"
-+	wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs"
- 	WPS_DEFINE=" -DHAVE_LIBWPS"
- ])
- 
diff --git a/abiword-3.0.0-link-grammar-5-second.patch b/abiword-3.0.0-link-grammar-5-second.patch
deleted file mode 100644
index c471c74..0000000
--- a/abiword-3.0.0-link-grammar-5-second.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig	2014-06-30 08:21:30.000000000 -0500
-+++ abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp	2014-06-30 08:27:01.000000000 -0500
-@@ -220,6 +220,7 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	  pErr = NULL;
- 	}
- 
-+#ifdef DEAD_DEBUG_CODE
- 	//	  for(i=0; i< pT->m_vecGrammarErrors.getItemCount(); i++)
- 	// {
- 	//    pErr = pT->m_vecGrammarErrors.getNthItem(i);
-@@ -227,15 +228,10 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	//  }
- 	UT_UTF8String sErr = linkage_get_violation_name(linkage);
- 	//	UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str()));
--	UT_sint32 count = linkage_get_num_sublinkages(linkage);
- 	//
- 	// Find linkages with violations
- 	//
--	for(i=0; i<count;i++)
- 	{
--	  UT_sint32 iok = linkage_set_current_sublinkage(linkage, i);
--	  if(iok == 0)
--	    continue;
- 	  UT_sint32 j = 0;
- 	  UT_sint32 iNum = linkage_get_num_links(linkage);
- 	  for(j=0;j< iNum;j++)
-@@ -252,6 +248,8 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	  }
- 	}
- 	linkage_delete(linkage);
-+#endif // DEAD_DEBUG_CODE
-+
- 	for(i=0; i<  vecMapOfWords.getItemCount(); i++)
- 	{
- 	  AbiGrammarError * p = vecMapOfWords.getNthItem(i);
diff --git a/abiword-3.0.0-link-grammar-5.patch b/abiword-3.0.0-link-grammar-5.patch
deleted file mode 100644
index bbf75f6..0000000
--- a/abiword-3.0.0-link-grammar-5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig	2014-06-29 14:50:30.000000000 -0500
-+++ abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp	2014-06-29 14:55:39.000000000 -0500
-@@ -145,12 +145,11 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	  }
- 	  AbiGrammarError * pWordMap = new  AbiGrammarError();
- 	  pWordMap->m_iErrLow = iLow;
--	  pWordMap->m_iErrHigh = iLow + strlen(sentence_get_nth_word(sent, i));
-+	  pWordMap->m_iErrHigh = iLow + strlen(linkage_get_word(linkage, i));
- 	  pWordMap->m_iWordNum = i;
- 	  vecMapOfWords.addItem(pWordMap);
- 	  bool bNew = false;
--	  if(!sentence_nth_word_has_disjunction(sent, i))
--	  {
-+
- 	    //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string));
- 	    if(pErr == NULL)
- 	    {
-@@ -167,7 +166,7 @@ bool LinkGrammarWrap::parseSentence(Piec
- 		}
- 		pErr = new AbiGrammarError();
- 	      }
--	      iHigh = iLow + strlen(sentence_get_nth_word(sent, i));
-+	      iHigh = iLow + strlen(linkage_get_word(linkage, i));
- 	      pErr->m_iErrLow = iLow + iOff -1;
- 	      pErr->m_iErrHigh = iHigh + iOff -1;
- 	      if(pErr->m_iErrLow < 0)
-@@ -188,7 +187,7 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	      //
- 	      // Expand the sqiggle
- 	      //
--	      iHigh = iLow + strlen(sentence_get_nth_word(sent, i)) + iOff;
-+	      iHigh = iLow + strlen(linkage_get_word(linkage, i)) + iOff;
- 	      pErr->m_iErrHigh = iHigh;
- 	      if(pErr->m_iErrHigh < totlen-1)
- 	      {
-@@ -196,8 +195,7 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	      }
- 	      pErr->m_iWordNum = i;
- 	    }
--	  }
--	  iLow += strlen(sentence_get_nth_word(sent, i));
-+	  iLow += strlen(linkage_get_word(linkage, i));
- 	}
- 	//
- 	// No NULL links but still an error , mark the whole sentence bad.
diff --git a/abiword.spec b/abiword.spec
index 4ab8121..8b2035c 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -20,9 +20,6 @@ Source13: abiword.xml
 Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.8.3-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
-Patch3: abiword-3.0.0-librevenge.patch
-Patch4: abiword-3.0.0-link-grammar-5.patch
-Patch5: abiword-3.0.0-link-grammar-5-second.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -44,7 +41,6 @@ BuildRequires: gtk3-devel
 BuildRequires: gtkmathview-devel
 BuildRequires: libgsf-devel
 BuildRequires: libpng-devel
-BuildRequires: librevenge-devel
 BuildRequires: librsvg2-devel
 BuildRequires: libsoup-devel
 BuildRequires: libwmf-devel
@@ -107,9 +103,6 @@ Python bindings for developing with libabiword
 # patch abiword
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .boolean
-%patch3 -p0 -b .librevenge
-%patch4 -p1 -b .link-grammar-5
-%patch5 -p1 -b .link-grammar-5-second
 
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-%{version}

From 2eb4cbfe6225820f1c381fb8052d0f705e8b6b93 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Tue, 27 Jan 2015 08:51:41 +0100
Subject: [PATCH 02/86] Rebuild for boost 1.57.0

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 4ab8121..6a7bfd2 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -200,6 +200,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1:3.0.1-2
+- Rebuild for boost 1.57.0
+
 * Wed Dec 24 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.1-1
 - Update to 3.0.1 stable
 

From 9c79c12df34341cefb4cef557e346058ef79dd80 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 26 Mar 2015 15:35:39 +0000
Subject: [PATCH 03/86] Add an AppData file for the software center

---
 abiword.spec | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 6a7bfd2..4d840d4 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -134,6 +134,51 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 cd $RPM_BUILD_DIR/abiword-%{version}
 make install DESTDIR=%{buildroot}
 
+# Register as an application to be visible in the software center
+#
+# NOTE: It would be *awesome* if this file was maintained by the upstream
+# project, translated and installed into the right place during `make install`.
+#
+# See http://www.freedesktop.org/software/appstream/docs/ for more details.
+#
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
+<!--
+BugReportURL: http://bugzilla.abisource.com/show_bug.cgi?id=13672
+SentUpstream: 2014-09-17
+-->
+<application>
+  <id type="desktop">abiword.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <description>
+    <p>
+      AbiWord is a free word processing program similar to Microsoft® Word.
+      It is suitable for a wide variety of word processing tasks.
+    </p>
+    <p>
+      AbiWord allows you to collaborate with multiple people on one document at the
+      same time.
+      It is tightly integrated with the AbiCollab.net web service, which lets you
+      store documents online, allows easy document sharing with your friends, and
+      performs format conversions on the fly.
+    </p>
+    <!-- FIXME: Probably needs another paragraph -->
+  </description>
+  <url type="homepage">http://www.abisource.com/</url>
+  <screenshots>
+  <!-- FIXME: Needs an official up to date screenshot -->
+    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/a.png</screenshot>
+    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/b.png</screenshot>
+    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/c.png</screenshot>
+  </screenshots>
+  <!-- FIXME: change this to an upstream email address for spec updates
+  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
+   -->
+</application>
+EOF
+
 # install the documentation
 cd $RPM_BUILD_DIR/abiword-docs-%{version}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help
@@ -169,6 +214,7 @@ fi
 
 %files
 %{_bindir}/abiword
+%{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/mime-info/abiword.mime
 %{_datadir}/mime-info/abiword.keys
@@ -200,6 +246,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Thu Mar 26 2015 Richard Hughes <rhughes@redhat.com> - 1:3.0.1-3
+- Add an AppData file for the software center
+
 * Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1:3.0.1-2
 - Rebuild for boost 1.57.0
 

From 849cb14c62a591fd87da86150dda64365069cd14 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Sat, 2 May 2015 11:35:40 +0200
Subject: [PATCH 04/86] Rebuilt for GCC 5 C++11 ABI change

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 4d840d4..9682b84 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -246,6 +246,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1:3.0.1-4
+- Rebuilt for GCC 5 C++11 ABI change
+
 * Thu Mar 26 2015 Richard Hughes <rhughes@redhat.com> - 1:3.0.1-3
 - Add an AppData file for the software center
 

From b1d60faabef21bdc1b7ec58d775ea9b84ec33e46 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 6 Jun 2015 18:44:28 +0200
Subject: [PATCH 05/86] fix libwp? detection

---
 abiword-3.0.0-libwp.patch | 36 ++++++++++++++++++++++++++++++++++++
 abiword.spec              |  7 +++++--
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 abiword-3.0.0-libwp.patch

diff --git a/abiword-3.0.0-libwp.patch b/abiword-3.0.0-libwp.patch
new file mode 100644
index 0000000..9f269bd
--- /dev/null
+++ b/abiword-3.0.0-libwp.patch
@@ -0,0 +1,36 @@
+From 9734c2cc2638b16cc9b9c33adb2fbe5b793226f5 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 6 Jun 2015 18:43:14 +0200
+Subject: [PATCH] fix libwp? detection
+
+---
+ plugin-configure.m4 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugin-configure.m4 b/plugin-configure.m4
+index 54998fb..92e4ec2 100644
+--- a/plugin-configure.m4
++++ b/plugin-configure.m4
+@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS])
+ AC_SUBST([BMP_LIBS])
+ 
+ 
+-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
++wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
+ wpg_deps="no"
+ 
+ if test "$enable_wpg" != ""; then
+@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS])
+ AC_SUBST([AIKSAURUS_LIBS])
+ 
+ 
+-wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
++wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
++wordperfect_wps_pkgs='libwps-0.3'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+-- 
+2.4.2
+
diff --git a/abiword.spec b/abiword.spec
index 9682b84..daa6890 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -23,6 +23,7 @@ Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-3.0.0-librevenge.patch
 Patch4: abiword-3.0.0-link-grammar-5.patch
 Patch5: abiword-3.0.0-link-grammar-5-second.patch
+Patch6: abiword-3.0.0-libwp.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -110,17 +111,19 @@ Python bindings for developing with libabiword
 %patch3 -p0 -b .librevenge
 %patch4 -p1 -b .link-grammar-5
 %patch5 -p1 -b .link-grammar-5-second
+%patch6 -p1 -b .libwp
 
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-%{version}
 %patch0 -p1 -b .windowshelppaths
 
 %build
+# build libabiword and abiword
+cd $RPM_BUILD_DIR/abiword-%{version}
+
 aclocal
 autoconf
 
-# build libabiword and abiword
-cd $RPM_BUILD_DIR/abiword-%{version}
 %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
 # Build non SMP due to issues with gobject-introspection builds
 # make %{?_smp_mflags} V=1

From 78af610526081b913f748c32e4870940d4f14365 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 6 Jun 2015 21:41:32 +0200
Subject: [PATCH 06/86] make sure MS Works import is built

---
 abiword.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/abiword.spec b/abiword.spec
index daa6890..2850085 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -55,6 +55,7 @@ BuildRequires: libxslt-devel
 BuildRequires: link-grammar-devel
 BuildRequires: loudmouth-devel
 BuildRequires: ots-devel
+BuildRequires: pkgconfig(libwps-0.3)
 BuildRequires: poppler-devel
 BuildRequires: popt-devel
 BuildRequires: pygobject3

From 1482cf1f893b6378f6c868a1f999912b7bd366d6 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 6 Jun 2015 21:49:18 +0200
Subject: [PATCH 07/86] adapt to libwps 0.4

---
 abiword-3.0.1-libwps-0.4.patch | 54 ++++++++++++++++++++++++++++++++++
 abiword.spec                   |  4 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 abiword-3.0.1-libwps-0.4.patch

diff --git a/abiword-3.0.1-libwps-0.4.patch b/abiword-3.0.1-libwps-0.4.patch
new file mode 100644
index 0000000..292f681
--- /dev/null
+++ b/abiword-3.0.1-libwps-0.4.patch
@@ -0,0 +1,54 @@
+From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 6 Jun 2015 21:48:02 +0200
+Subject: [PATCH] adapt to libwps 0.4
+
+---
+ plugin-configure.m4                           | 2 +-
+ plugins/wordperfect/plugin.m4                 | 2 +-
+ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/plugin-configure.m4 b/plugin-configure.m4
+index 2757f4a..093fbcb 100644
+--- a/plugin-configure.m4
++++ b/plugin-configure.m4
+@@ -1470,7 +1470,7 @@ AC_SUBST([AIKSAURUS_LIBS])
+ 
+ 
+ wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.3'
++wordperfect_wps_pkgs='libwps-0.4'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
+index 0aadbaf..bc32d48 100644
+--- a/plugins/wordperfect/plugin.m4
++++ b/plugins/wordperfect/plugin.m4
+@@ -1,6 +1,6 @@
+ 
+ wordperfect_pkgs="libwpd-0.10 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.3'
++wordperfect_wps_pkgs='libwps-0.4'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+index bd19971..3e69f79 100644
+--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
++++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+@@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input)
+ 	AbiWordperfectInputStream gsfInput(input);
+ 
+ 	libwps::WPSKind kind;
+-	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
++        libwps::WPSCreator creator;
++        bool needsEncoding = false;
++	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
+ 	
+ 	if (kind != libwps::WPS_TEXT)
+ 		confidence = libwps::WPS_CONFIDENCE_NONE;
+-- 
+2.4.2
+
diff --git a/abiword.spec b/abiword.spec
index 2850085..db824b1 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -24,6 +24,7 @@ Patch3: abiword-3.0.0-librevenge.patch
 Patch4: abiword-3.0.0-link-grammar-5.patch
 Patch5: abiword-3.0.0-link-grammar-5-second.patch
 Patch6: abiword-3.0.0-libwp.patch
+Patch7: abiword-3.0.1-libwps-0.4.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -55,7 +56,7 @@ BuildRequires: libxslt-devel
 BuildRequires: link-grammar-devel
 BuildRequires: loudmouth-devel
 BuildRequires: ots-devel
-BuildRequires: pkgconfig(libwps-0.3)
+BuildRequires: pkgconfig(libwps-0.4)
 BuildRequires: poppler-devel
 BuildRequires: popt-devel
 BuildRequires: pygobject3
@@ -113,6 +114,7 @@ Python bindings for developing with libabiword
 %patch4 -p1 -b .link-grammar-5
 %patch5 -p1 -b .link-grammar-5-second
 %patch6 -p1 -b .libwp
+%patch7 -p1 -b .libwps-0.4
 
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-%{version}

From 96ed9e86b61721cdb72a746bd968887efc2b55cb Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 6 Jun 2015 22:31:35 +0200
Subject: [PATCH 08/86] bump release

---
 abiword.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index db824b1..a4a17a8 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -252,6 +252,10 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Sat Jun 06 2015 David Tardon <dtardon@redhat.com> - 1:3.0.1-5
+- really enable WordPerfect import
+- enable MS Works import
+
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1:3.0.1-4
 - Rebuilt for GCC 5 C++11 ABI change
 

From 0a9a40902e622c38c9e29fdeb4f1d1818638e551 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 7 Jun 2015 17:08:48 +0200
Subject: [PATCH 09/86] fix build in koji

Without this, AX_BOOST_BASE macro is not found.
---
 abiword.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index a4a17a8..59198c3 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -124,7 +124,7 @@ Python bindings for developing with libabiword
 # build libabiword and abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
 
-aclocal
+aclocal -I.
 autoconf
 
 %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection

From 4ca470e8b26c4b91ae68fd98690fd741922d0725 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 16 Jun 2015 23:32:52 +0000
Subject: [PATCH 10/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 59198c3..bb9e7de 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -252,6 +252,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Jun 06 2015 David Tardon <dtardon@redhat.com> - 1:3.0.1-5
 - really enable WordPerfect import
 - enable MS Works import

From 1c31eab6ebfa6643ad4a2f4288e710be029dc836 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 22 Jul 2015 18:01:06 +0200
Subject: [PATCH 11/86] rebuild for Boost 1.58

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index bb9e7de..a8f6768 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -252,6 +252,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1:3.0.1-7
+- rebuild for Boost 1.58
+
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 280bf81950edd888f30cf1bf51b61fde2fb68314 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 29 Jul 2015 11:55:23 -0500
Subject: [PATCH 12/86] - Rebuilt for
 https://fedoraproject.org/wiki/Changes/F23Boost159

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index a8f6768..4e5246b 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -252,6 +252,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
 * Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1:3.0.1-7
 - rebuild for Boost 1.58
 

From 41617ae6d89026dd6b3777427f06bf8a3180a682 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 3 Feb 2016 15:55:53 +0000
Subject: [PATCH 13/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 4e5246b..32a8cc4 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -252,6 +252,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
 

From c0d6dffbd16126990eba916782237e5347f4ba47 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 10 Apr 2016 15:31:15 +0100
Subject: [PATCH 14/86] Add patches to fix building with newer gnutls and gcc6,
 Add patch to fix Wordperfect support

---
 abiword-3.0.1-fixwps.patch |  31 +++++
 abiword-3.0.1-gcc6.patch   | 263 +++++++++++++++++++++++++++++++++++++
 abiword-3.0.1-gnutls.patch |  23 ++++
 abiword.spec               |  15 ++-
 4 files changed, 329 insertions(+), 3 deletions(-)
 create mode 100644 abiword-3.0.1-fixwps.patch
 create mode 100644 abiword-3.0.1-gcc6.patch
 create mode 100644 abiword-3.0.1-gnutls.patch

diff --git a/abiword-3.0.1-fixwps.patch b/abiword-3.0.1-fixwps.patch
new file mode 100644
index 0000000..2929d5b
--- /dev/null
+++ b/abiword-3.0.1-fixwps.patch
@@ -0,0 +1,31 @@
+--- abiword-3.0.1/plugin-configure.m4.orig	2016-04-10 14:22:18.271356761 +0100
++++ abiword-3.0.1/plugin-configure.m4	2016-04-10 14:24:22.493303398 +0100
+@@ -1355,7 +1355,7 @@
+ AC_SUBST([BMP_LIBS])
+ 
+ 
+-wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
++wpg_pkgs="libwpg-0.3 $gsf_req"
+ wpg_deps="no"
+ 
+ if test "$enable_wpg" != ""; then
+@@ -1469,8 +1469,8 @@
+ AC_SUBST([AIKSAURUS_LIBS])
+ 
+ 
+-wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.4'
++wordperfect_pkgs="libwpd-0.10 $gsf_req"
++wordperfect_wps_pkgs='libwps-0.3'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+@@ -1499,7 +1499,7 @@
+ 
+ PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ],
+ [
+-	wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs"
++	wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs"
+ 	WPS_DEFINE=" -DHAVE_LIBWPS"
+ ])
+ 
diff --git a/abiword-3.0.1-gcc6.patch b/abiword-3.0.1-gcc6.patch
new file mode 100644
index 0000000..cc14250
--- /dev/null
+++ b/abiword-3.0.1-gcc6.patch
@@ -0,0 +1,263 @@
+Index: src/af/xap/cocoa/xap_CocoaApp.h
+===================================================================
+--- src/af/xap/cocoa/xap_CocoaApp.h	(revision 35181)
++++ src/af/xap/cocoa/xap_CocoaApp.h	(working copy)
+@@ -65,7 +65,7 @@
+ 	virtual void							copyToClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard = true) = 0;
+ 	virtual void							pasteFromClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard, bool bHonorFormatting = true) = 0;
+ 	virtual bool							canPasteFromClipboard() = 0;
+-	virtual const char *					getUserPrivateDirectory();
++	virtual const char *					getUserPrivateDirectory() const;
+ 	virtual bool							findAbiSuiteBundleFile(std::string & path, const char * filename, const char * subdir = 0); // checks only bundle
+ 	virtual bool							findAbiSuiteLibFile(std::string & path, const char * filename, const char * subdir = 0);
+ 	virtual bool							findAbiSuiteAppFile(std::string & path, const char * filename, const char * subdir = 0); // doesn't check user-dir
+Index: src/af/xap/cocoa/xap_CocoaApp.cpp
+===================================================================
+--- src/af/xap/cocoa/xap_CocoaApp.cpp	(revision 35181)
++++ src/af/xap/cocoa/xap_CocoaApp.cpp	(working copy)
+@@ -192,7 +192,7 @@
+ 	*flags = m_geometry.flags;
+ }
+ 
+-const char * XAP_CocoaApp::getUserPrivateDirectory()
++const char * XAP_CocoaApp::getUserPrivateDirectory() const
+ {
+ 	static const char * szAbiDir = "Library/Application Support/AbiSuite";
+ 	
+Index: src/af/xap/gtk/xap_UnixApp.h
+===================================================================
+--- src/af/xap/gtk/xap_UnixApp.h	(revision 35181)
++++ src/af/xap/gtk/xap_UnixApp.h	(working copy)
+@@ -73,7 +73,7 @@
+ 	virtual void							pasteFromClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard, bool bHonorFormatting = true) = 0;
+ 	virtual bool							canPasteFromClipboard() = 0;
+ 	void									migrate(const char *oldName, const char *newName, const char *path) const;
+-	virtual const char *					getUserPrivateDirectory();
++	virtual const char *					getUserPrivateDirectory() const;
+ 
+ 	virtual void							setSelectionStatus(AV_View * pView) = 0;
+ 	virtual void							clearSelection() = 0;
+Index: src/af/xap/gtk/xap_UnixApp.cpp
+===================================================================
+--- src/af/xap/gtk/xap_UnixApp.cpp	(revision 35181)
++++ src/af/xap/gtk/xap_UnixApp.cpp	(working copy)
+@@ -207,70 +207,60 @@
+ }
+ 
+ // This should be removed at some time.
+-void XAP_UnixApp::migrate (const char *oldName, const char *newName, const char *path) const
++void XAP_UnixApp::migrate(const char *oldName,
++                          const char *newName, const char *path) const
+ {
+-	if (path && newName && oldName && (*oldName == '/'))
+-	{
+-		char *old = new char[strlen(path) - strlen(newName) + strlen(oldName)];
+-     
+-		if (old)
+-		{
+-			size_t len = strrchr(path, '/') - path;       
+-			strncpy(old, path, len);
+-			old[len] = 0;
+-			strcat(old, oldName);
++    if (path && newName && oldName && (*oldName == '/')) {
+ 
+-			if (g_access(old, F_OK) == 0) 
+-			{
+-				UT_WARNINGMSG(("Renaming: %s -> %s\n", old, path));
+-				g_rename(old, path);
+-			}
+-                     
+-			delete[] old;
+-		}         
+-	}
++        const char* end = strrchr(path, '/');
++        if (!end) {
++            UT_WARNINGMSG(("invalid path '%s', '/' not found", path));
++            return;
++        }
++
++        std::string old(path, end);
++        old += oldName;
++
++        if (g_access(old.c_str(), F_OK) == 0) {
++            UT_WARNINGMSG(("Renaming: %s -> %s\n", old.c_str(), path));
++            g_rename(old.c_str(), path);
++        }
++    }
+ }
+- 
+-const char * XAP_UnixApp::getUserPrivateDirectory()
++
++const char * XAP_UnixApp::getUserPrivateDirectory() const
+ {
+-	/* return a pointer to a static buffer */
+-    static char *buf = NULL;
++    /* return a pointer to a static buffer */
++    static std::string private_dir;
+ 
+-    if (buf == NULL)
+-    {
+-		const char * szAbiDir = "abiword";
+-		const char * szCfgDir = ".config";
++    if (private_dir.empty()) {
++        const char * szAbiDir = "abiword";
++        const char * szCfgDir = ".config";
+ 
+-		const char * szXDG = getenv("XDG_CONFIG_HOME");
+-		if (!szXDG || !*szXDG) {
+-			const char * szHome = getenv("HOME");
+-			if (!szHome || !*szHome)
+-				szHome = "./";
++        const char * szXDG = getenv("XDG_CONFIG_HOME");
++        if (!szXDG || !*szXDG) {
++            const char * szHome = getenv("HOME");
++            if (!szHome || !*szHome)
++                szHome = "./";
+ 
+-			buf = new char[strlen(szHome)+strlen(szCfgDir)+strlen(szAbiDir)+4];
++            private_dir = szHome;
++            if (szHome[strlen(szHome)-1] != '/') {
++                private_dir.push_back('/');
++            }
++            private_dir += szCfgDir;
++        } else {
++            private_dir = szXDG;
++        }
+ 
+-			strcpy(buf, szHome);
+-			if (buf[strlen(buf)-1] != '/')
+-				strcat(buf, "/");
+-			strcat(buf, szCfgDir);
+-		} else {
+-			buf = new char[strlen(szXDG)+strlen(szAbiDir)+4];
+-			strcpy(buf, szXDG);
+-		}
++        private_dir += '/';
++        private_dir += szAbiDir;
+ 
+-		strcat(buf, "/");
+-		strcat(buf, szAbiDir);
+-
+-#ifdef PATH_MAX
+-        if (strlen(buf) >= PATH_MAX)
+-            DELETEPV(buf);
+-#endif
+-
+-		// migration / legacy
+-		migrate("/AbiSuite", szAbiDir, buf); 
++        // migration / legacy
++        // XXX shouldn't that be /.AbiSuite ?
++        migrate("/AbiSuite", szAbiDir, private_dir.c_str());
+     }
+ 
+-	return buf;
++    return private_dir.c_str();
+ }
+ 
+ 
+Index: src/af/xap/xp/xap_App.h
+===================================================================
+--- src/af/xap/xp/xap_App.h	(revision 35181)
++++ src/af/xap/xp/xap_App.h	(working copy)
+@@ -178,7 +178,7 @@
+ 
+ 	virtual const XAP_StringSet *			getStringSet() const = 0;
+ 	virtual void						migrate(const char *oldName, const char *newName, const char *path) const;
+-	virtual const char *				getUserPrivateDirectory() = 0;
++	virtual const char *				getUserPrivateDirectory() const = 0;
+ 	virtual const char *				getAbiSuiteLibDir() const;
+ 	virtual const char *				getAbiSuiteAppDir() const = 0;
+ 	virtual bool					findAbiSuiteLibFile(std::string & path, const char * filename, const char * subdir = 0);
+Index: src/af/xap/win/xap_Win32App.h
+===================================================================
+--- src/af/xap/win/xap_Win32App.h	(revision 35181)
++++ src/af/xap/win/xap_Win32App.h	(working copy)
+@@ -65,7 +65,7 @@
+ 	virtual void							pasteFromClipboard(PD_DocumentRange * pDocRange, bool, bool) = 0;
+ 	virtual bool							canPasteFromClipboard(void) = 0;
+ 	virtual void							cacheCurrentSelection(AV_View *) = 0;
+-	virtual const char *					getUserPrivateDirectory(void);
++	virtual const char *					getUserPrivateDirectory(void) const;
+ 
+ 	virtual HICON							getIcon(void) = 0;
+ 	virtual HICON							getSmallIcon(void) = 0;
+Index: src/af/xap/win/xap_Win32App.cpp
+===================================================================
+--- src/af/xap/win/xap_Win32App.cpp	(revision 35181)
++++ src/af/xap/win/xap_Win32App.cpp	(working copy)
+@@ -238,7 +238,7 @@
+ 	return result;
+ }
+ 
+-const char * XAP_Win32App::getUserPrivateDirectory(void)
++const char * XAP_Win32App::getUserPrivateDirectory(void) const
+ {
+ 	/* return a pointer to a static buffer */
+ 
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 35181)
++++ configure.ac	(working copy)
+@@ -616,7 +616,7 @@
+ #
+ 
+ # We need libpng
+-for l in libpng libpng14 libpng12; do
++for l in libpng libpng16 libpng14 libpng12; do
+   AC_MSG_CHECKING(for $l)
+   if $PKG_CONFIG --exists $l ; then
+     AC_MSG_RESULT(yes)
+Index: plugins/xslfo/xp/ie_exp_XSL-FO.cpp
+===================================================================
+--- plugins/xslfo/xp/ie_exp_XSL-FO.cpp	(revision 35181)
++++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp	(working copy)
+@@ -1451,7 +1451,7 @@
+ 	{ \
+ 		UT_UTF8String esc = szValue; \
+ 		esc.escapeXML(); \
+-		buf += " "x"=\""; \
++		buf += " " x"=\""; \
+ 		buf += esc.utf8_str(); \
+ 		buf += "\""; \
+ 	}
+Index: plugins/latex/xp/ie_exp_LaTeX.cpp
+===================================================================
+--- plugins/latex/xp/ie_exp_LaTeX.cpp	(revision 35181)
++++ plugins/latex/xp/ie_exp_LaTeX.cpp	(working copy)
+@@ -1330,7 +1330,7 @@
+ 	m_pie->write(sBuf.c_str(),sBuf.size());
+ }
+ 
+-#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true;
++#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true;
+ #define SUBd(a,who) case a: subst = who; return true;
+ static bool _convertLettersToSymbols(char c, const char *& subst)
+ {
+Index: plugins/collab/backends/service/xp/soa_soup.cpp
+===================================================================
+--- plugins/collab/backends/service/xp/soa_soup.cpp	(revision 35181)
++++ plugins/collab/backends/service/xp/soa_soup.cpp	(working copy)
+@@ -163,7 +163,7 @@
+ 	
+ 	static bool _invoke(const std::string& /*url*/, const soa::method_invocation& /*mi*/, SoaSoupSession& sess, std::string& result) {
+ 		if (!sess.m_session || !sess.m_msg )
+-			return soa::GenericPtr();
++			return false;
+ 
+ 		guint status = soup_session_send_message (sess.m_session, sess.m_msg);
+ 		if (!(SOUP_STATUS_IS_SUCCESSFUL (status) ||
+Index: plugins/collab/backends/service/xp/RealmProtocol.cpp
+===================================================================
+--- plugins/collab/backends/service/xp/RealmProtocol.cpp	(revision 35181)
++++ plugins/collab/backends/service/xp/RealmProtocol.cpp	(working copy)
+@@ -6,8 +6,8 @@
+ 
+ #define MAX_PACKET_DATA_SIZE 64*1024*1024
+ 		
+-#define RPV1_PACKET_NONEXISTENT -2
+-#define RPV1_PACKET_VARIABLE -1
++#define RPV1_PACKET_NONEXISTENT uint32_t(-2)
++#define RPV1_PACKET_VARIABLE uint32_t(-1)
+ 	
+ static uint32_t body_size[6] = {
+ 	RPV1_PACKET_NONEXISTENT, /* 0: reserved */
diff --git a/abiword-3.0.1-gnutls.patch b/abiword-3.0.1-gnutls.patch
new file mode 100644
index 0000000..9b282c0
--- /dev/null
+++ b/abiword-3.0.1-gnutls.patch
@@ -0,0 +1,23 @@
+Index: plugins/collab/backends/service/xp/tls_tunnel.cpp
+===================================================================
+--- plugins/collab/backends/service/xp/tls_tunnel.cpp	(revision 35191)
++++ plugins/collab/backends/service/xp/tls_tunnel.cpp	(working copy)
+@@ -306,9 +306,6 @@
+ 	disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr);		
+ }
+ 
+-static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 };
+-static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 };
+-
+ // FIXME: this clientproxy can only handle 1 SSL connection at the same time
+ ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, 
+ 		const std::string& ca_file, bool check_hostname)
+@@ -400,8 +397,6 @@
+ 	// setup session
+ 	return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t());
+ 	return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t());
+-	return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t());
+-	return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t());
+ 	return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t());
+ 
+ 	// setup transport
diff --git a/abiword.spec b/abiword.spec
index 32a8cc4..ebcf758 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -25,6 +25,9 @@ Patch4: abiword-3.0.0-link-grammar-5.patch
 Patch5: abiword-3.0.0-link-grammar-5-second.patch
 Patch6: abiword-3.0.0-libwp.patch
 Patch7: abiword-3.0.1-libwps-0.4.patch
+Patch8: abiword-3.0.1-gnutls.patch
+Patch9: abiword-3.0.1-gcc6.patch
+Patch10: abiword-3.0.1-fixwps.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -115,6 +118,9 @@ Python bindings for developing with libabiword
 %patch5 -p1 -b .link-grammar-5-second
 %patch6 -p1 -b .libwp
 %patch7 -p1 -b .libwps-0.4
+%patch8 -p0 -b .gnutls
+%patch9 -p0 -b .gcc6
+%patch10 -p1 -b .wps2
 
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-%{version}
@@ -124,8 +130,7 @@ Python bindings for developing with libabiword
 # build libabiword and abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
 
-aclocal -I.
-autoconf
+autoreconf -vif
 
 %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
 # Build non SMP due to issues with gobject-introspection builds
@@ -252,6 +257,10 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Sun Apr 10 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.1-10
+- Add patches to fix building with newer gnutls and gcc6
+- Add patch to fix Wordperfect support
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 4d3e79383d0faf2858ec89e334d72e830c9b7368 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 10 Apr 2016 20:32:49 +0100
Subject: [PATCH 15/86] fix parallel build (thanks yselkowi) rhbz 1214395

---
 abiword-3.0.1-parallel-make.patch | 11 +++++++++++
 abiword.spec                      | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 abiword-3.0.1-parallel-make.patch

diff --git a/abiword-3.0.1-parallel-make.patch b/abiword-3.0.1-parallel-make.patch
new file mode 100644
index 0000000..57608cb
--- /dev/null
+++ b/abiword-3.0.1-parallel-make.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am	2013-02-19 18:39:42.000000000 -0600
++++ b/src/Makefile.am	2015-04-21 21:36:37.504001500 -0500
+@@ -168,7 +168,7 @@ if HAVE_INTROSPECTION
+ 
+ INTROSPECTION_GIRS += Abi-@ABIWORD_SERIES@.gir
+ 
+-Abi_@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile
++Abi-@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile
+ Abi_@ABI_SUB_SERIES@_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gsf-1
+ Abi_@ABI_SUB_SERIES@_gir_CFLAGS = $(libabiword_@ABIWORD_SERIES@_la_CPPFLAGS)
+ Abi_@ABI_SUB_SERIES@_gir_LIBS = libabiword-@ABIWORD_SERIES@.la
diff --git a/abiword.spec b/abiword.spec
index ebcf758..56a7a76 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -28,6 +28,7 @@ Patch7: abiword-3.0.1-libwps-0.4.patch
 Patch8: abiword-3.0.1-gnutls.patch
 Patch9: abiword-3.0.1-gcc6.patch
 Patch10: abiword-3.0.1-fixwps.patch
+Patch11: abiword-3.0.1-parallel-make.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -121,6 +122,7 @@ Python bindings for developing with libabiword
 %patch8 -p0 -b .gnutls
 %patch9 -p0 -b .gcc6
 %patch10 -p1 -b .wps2
+%patch11 -p1 -b .pb
 
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-%{version}
@@ -133,9 +135,8 @@ cd $RPM_BUILD_DIR/abiword-%{version}
 autoreconf -vif
 
 %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
-# Build non SMP due to issues with gobject-introspection builds
-# make %{?_smp_mflags} V=1
-make V=1
+
+make %{?_smp_mflags} V=1
 
 # build the documentation
 cd $RPM_BUILD_DIR/abiword-docs-%{version}
@@ -257,6 +258,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Sun Apr 10 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.1-11
+- fix parallel build (thanks yselkowi) rhbz 1214395
+
 * Sun Apr 10 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.1-10
 - Add patches to fix building with newer gnutls and gcc6
 - Add patch to fix Wordperfect support

From 35523bd83d815f7aff0e293c3036a5e76f75f444 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 19 Jul 2016 06:29:21 +0000
Subject: [PATCH 16/86] -
 https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 56a7a76..7554713 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -258,6 +258,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.1-12
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 * Sun Apr 10 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.1-11
 - fix parallel build (thanks yselkowi) rhbz 1214395
 

From 6f5379884d312f506652df769cc25578730a4ac9 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 29 Nov 2016 23:48:40 +0000
Subject: [PATCH 17/86] 3.0.2

---
 abiword-3.0.0-libwp.patch                 |  36 ---
 abiword-3.0.0-link-grammar-5-second.patch |  35 ---
 abiword-3.0.0-link-grammar-5.patch        |  45 ----
 abiword-3.0.1-fixwps.patch                |  31 ---
 abiword-3.0.1-gcc6.patch                  | 263 ----------------------
 abiword-3.0.1-gnutls.patch                |  23 --
 abiword-3.0.1-libwps-0.4.patch            |  54 -----
 abiword-3.0.1-parallel-make.patch         |  11 -
 abiword.spec                              |  29 +--
 sources                                   |   4 +-
 10 files changed, 10 insertions(+), 521 deletions(-)
 delete mode 100644 abiword-3.0.0-libwp.patch
 delete mode 100644 abiword-3.0.0-link-grammar-5-second.patch
 delete mode 100644 abiword-3.0.0-link-grammar-5.patch
 delete mode 100644 abiword-3.0.1-fixwps.patch
 delete mode 100644 abiword-3.0.1-gcc6.patch
 delete mode 100644 abiword-3.0.1-gnutls.patch
 delete mode 100644 abiword-3.0.1-libwps-0.4.patch
 delete mode 100644 abiword-3.0.1-parallel-make.patch

diff --git a/abiword-3.0.0-libwp.patch b/abiword-3.0.0-libwp.patch
deleted file mode 100644
index 9f269bd..0000000
--- a/abiword-3.0.0-libwp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9734c2cc2638b16cc9b9c33adb2fbe5b793226f5 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 6 Jun 2015 18:43:14 +0200
-Subject: [PATCH] fix libwp? detection
-
----
- plugin-configure.m4 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugin-configure.m4 b/plugin-configure.m4
-index 54998fb..92e4ec2 100644
---- a/plugin-configure.m4
-+++ b/plugin-configure.m4
-@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS])
- AC_SUBST([BMP_LIBS])
- 
- 
--wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
-+wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS])
- AC_SUBST([AIKSAURUS_LIBS])
- 
- 
--wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.3'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
--- 
-2.4.2
-
diff --git a/abiword-3.0.0-link-grammar-5-second.patch b/abiword-3.0.0-link-grammar-5-second.patch
deleted file mode 100644
index c471c74..0000000
--- a/abiword-3.0.0-link-grammar-5-second.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig	2014-06-30 08:21:30.000000000 -0500
-+++ abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp	2014-06-30 08:27:01.000000000 -0500
-@@ -220,6 +220,7 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	  pErr = NULL;
- 	}
- 
-+#ifdef DEAD_DEBUG_CODE
- 	//	  for(i=0; i< pT->m_vecGrammarErrors.getItemCount(); i++)
- 	// {
- 	//    pErr = pT->m_vecGrammarErrors.getNthItem(i);
-@@ -227,15 +228,10 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	//  }
- 	UT_UTF8String sErr = linkage_get_violation_name(linkage);
- 	//	UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str()));
--	UT_sint32 count = linkage_get_num_sublinkages(linkage);
- 	//
- 	// Find linkages with violations
- 	//
--	for(i=0; i<count;i++)
- 	{
--	  UT_sint32 iok = linkage_set_current_sublinkage(linkage, i);
--	  if(iok == 0)
--	    continue;
- 	  UT_sint32 j = 0;
- 	  UT_sint32 iNum = linkage_get_num_links(linkage);
- 	  for(j=0;j< iNum;j++)
-@@ -252,6 +248,8 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	  }
- 	}
- 	linkage_delete(linkage);
-+#endif // DEAD_DEBUG_CODE
-+
- 	for(i=0; i<  vecMapOfWords.getItemCount(); i++)
- 	{
- 	  AbiGrammarError * p = vecMapOfWords.getNthItem(i);
diff --git a/abiword-3.0.0-link-grammar-5.patch b/abiword-3.0.0-link-grammar-5.patch
deleted file mode 100644
index bbf75f6..0000000
--- a/abiword-3.0.0-link-grammar-5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig	2014-06-29 14:50:30.000000000 -0500
-+++ abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp	2014-06-29 14:55:39.000000000 -0500
-@@ -145,12 +145,11 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	  }
- 	  AbiGrammarError * pWordMap = new  AbiGrammarError();
- 	  pWordMap->m_iErrLow = iLow;
--	  pWordMap->m_iErrHigh = iLow + strlen(sentence_get_nth_word(sent, i));
-+	  pWordMap->m_iErrHigh = iLow + strlen(linkage_get_word(linkage, i));
- 	  pWordMap->m_iWordNum = i;
- 	  vecMapOfWords.addItem(pWordMap);
- 	  bool bNew = false;
--	  if(!sentence_nth_word_has_disjunction(sent, i))
--	  {
-+
- 	    //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string));
- 	    if(pErr == NULL)
- 	    {
-@@ -167,7 +166,7 @@ bool LinkGrammarWrap::parseSentence(Piec
- 		}
- 		pErr = new AbiGrammarError();
- 	      }
--	      iHigh = iLow + strlen(sentence_get_nth_word(sent, i));
-+	      iHigh = iLow + strlen(linkage_get_word(linkage, i));
- 	      pErr->m_iErrLow = iLow + iOff -1;
- 	      pErr->m_iErrHigh = iHigh + iOff -1;
- 	      if(pErr->m_iErrLow < 0)
-@@ -188,7 +187,7 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	      //
- 	      // Expand the sqiggle
- 	      //
--	      iHigh = iLow + strlen(sentence_get_nth_word(sent, i)) + iOff;
-+	      iHigh = iLow + strlen(linkage_get_word(linkage, i)) + iOff;
- 	      pErr->m_iErrHigh = iHigh;
- 	      if(pErr->m_iErrHigh < totlen-1)
- 	      {
-@@ -196,8 +195,7 @@ bool LinkGrammarWrap::parseSentence(Piec
- 	      }
- 	      pErr->m_iWordNum = i;
- 	    }
--	  }
--	  iLow += strlen(sentence_get_nth_word(sent, i));
-+	  iLow += strlen(linkage_get_word(linkage, i));
- 	}
- 	//
- 	// No NULL links but still an error , mark the whole sentence bad.
diff --git a/abiword-3.0.1-fixwps.patch b/abiword-3.0.1-fixwps.patch
deleted file mode 100644
index 2929d5b..0000000
--- a/abiword-3.0.1-fixwps.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- abiword-3.0.1/plugin-configure.m4.orig	2016-04-10 14:22:18.271356761 +0100
-+++ abiword-3.0.1/plugin-configure.m4	2016-04-10 14:24:22.493303398 +0100
-@@ -1355,7 +1355,7 @@
- AC_SUBST([BMP_LIBS])
- 
- 
--wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
-+wpg_pkgs="libwpg-0.3 $gsf_req"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-@@ -1469,8 +1469,8 @@
- AC_SUBST([AIKSAURUS_LIBS])
- 
- 
--wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.4'
-+wordperfect_pkgs="libwpd-0.10 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.3'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-@@ -1499,7 +1499,7 @@
- 
- PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ],
- [
--	wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs"
-+	wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs"
- 	WPS_DEFINE=" -DHAVE_LIBWPS"
- ])
- 
diff --git a/abiword-3.0.1-gcc6.patch b/abiword-3.0.1-gcc6.patch
deleted file mode 100644
index cc14250..0000000
--- a/abiword-3.0.1-gcc6.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-Index: src/af/xap/cocoa/xap_CocoaApp.h
-===================================================================
---- src/af/xap/cocoa/xap_CocoaApp.h	(revision 35181)
-+++ src/af/xap/cocoa/xap_CocoaApp.h	(working copy)
-@@ -65,7 +65,7 @@
- 	virtual void							copyToClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard = true) = 0;
- 	virtual void							pasteFromClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard, bool bHonorFormatting = true) = 0;
- 	virtual bool							canPasteFromClipboard() = 0;
--	virtual const char *					getUserPrivateDirectory();
-+	virtual const char *					getUserPrivateDirectory() const;
- 	virtual bool							findAbiSuiteBundleFile(std::string & path, const char * filename, const char * subdir = 0); // checks only bundle
- 	virtual bool							findAbiSuiteLibFile(std::string & path, const char * filename, const char * subdir = 0);
- 	virtual bool							findAbiSuiteAppFile(std::string & path, const char * filename, const char * subdir = 0); // doesn't check user-dir
-Index: src/af/xap/cocoa/xap_CocoaApp.cpp
-===================================================================
---- src/af/xap/cocoa/xap_CocoaApp.cpp	(revision 35181)
-+++ src/af/xap/cocoa/xap_CocoaApp.cpp	(working copy)
-@@ -192,7 +192,7 @@
- 	*flags = m_geometry.flags;
- }
- 
--const char * XAP_CocoaApp::getUserPrivateDirectory()
-+const char * XAP_CocoaApp::getUserPrivateDirectory() const
- {
- 	static const char * szAbiDir = "Library/Application Support/AbiSuite";
- 	
-Index: src/af/xap/gtk/xap_UnixApp.h
-===================================================================
---- src/af/xap/gtk/xap_UnixApp.h	(revision 35181)
-+++ src/af/xap/gtk/xap_UnixApp.h	(working copy)
-@@ -73,7 +73,7 @@
- 	virtual void							pasteFromClipboard(PD_DocumentRange * pDocRange, bool bUseClipboard, bool bHonorFormatting = true) = 0;
- 	virtual bool							canPasteFromClipboard() = 0;
- 	void									migrate(const char *oldName, const char *newName, const char *path) const;
--	virtual const char *					getUserPrivateDirectory();
-+	virtual const char *					getUserPrivateDirectory() const;
- 
- 	virtual void							setSelectionStatus(AV_View * pView) = 0;
- 	virtual void							clearSelection() = 0;
-Index: src/af/xap/gtk/xap_UnixApp.cpp
-===================================================================
---- src/af/xap/gtk/xap_UnixApp.cpp	(revision 35181)
-+++ src/af/xap/gtk/xap_UnixApp.cpp	(working copy)
-@@ -207,70 +207,60 @@
- }
- 
- // This should be removed at some time.
--void XAP_UnixApp::migrate (const char *oldName, const char *newName, const char *path) const
-+void XAP_UnixApp::migrate(const char *oldName,
-+                          const char *newName, const char *path) const
- {
--	if (path && newName && oldName && (*oldName == '/'))
--	{
--		char *old = new char[strlen(path) - strlen(newName) + strlen(oldName)];
--     
--		if (old)
--		{
--			size_t len = strrchr(path, '/') - path;       
--			strncpy(old, path, len);
--			old[len] = 0;
--			strcat(old, oldName);
-+    if (path && newName && oldName && (*oldName == '/')) {
- 
--			if (g_access(old, F_OK) == 0) 
--			{
--				UT_WARNINGMSG(("Renaming: %s -> %s\n", old, path));
--				g_rename(old, path);
--			}
--                     
--			delete[] old;
--		}         
--	}
-+        const char* end = strrchr(path, '/');
-+        if (!end) {
-+            UT_WARNINGMSG(("invalid path '%s', '/' not found", path));
-+            return;
-+        }
-+
-+        std::string old(path, end);
-+        old += oldName;
-+
-+        if (g_access(old.c_str(), F_OK) == 0) {
-+            UT_WARNINGMSG(("Renaming: %s -> %s\n", old.c_str(), path));
-+            g_rename(old.c_str(), path);
-+        }
-+    }
- }
-- 
--const char * XAP_UnixApp::getUserPrivateDirectory()
-+
-+const char * XAP_UnixApp::getUserPrivateDirectory() const
- {
--	/* return a pointer to a static buffer */
--    static char *buf = NULL;
-+    /* return a pointer to a static buffer */
-+    static std::string private_dir;
- 
--    if (buf == NULL)
--    {
--		const char * szAbiDir = "abiword";
--		const char * szCfgDir = ".config";
-+    if (private_dir.empty()) {
-+        const char * szAbiDir = "abiword";
-+        const char * szCfgDir = ".config";
- 
--		const char * szXDG = getenv("XDG_CONFIG_HOME");
--		if (!szXDG || !*szXDG) {
--			const char * szHome = getenv("HOME");
--			if (!szHome || !*szHome)
--				szHome = "./";
-+        const char * szXDG = getenv("XDG_CONFIG_HOME");
-+        if (!szXDG || !*szXDG) {
-+            const char * szHome = getenv("HOME");
-+            if (!szHome || !*szHome)
-+                szHome = "./";
- 
--			buf = new char[strlen(szHome)+strlen(szCfgDir)+strlen(szAbiDir)+4];
-+            private_dir = szHome;
-+            if (szHome[strlen(szHome)-1] != '/') {
-+                private_dir.push_back('/');
-+            }
-+            private_dir += szCfgDir;
-+        } else {
-+            private_dir = szXDG;
-+        }
- 
--			strcpy(buf, szHome);
--			if (buf[strlen(buf)-1] != '/')
--				strcat(buf, "/");
--			strcat(buf, szCfgDir);
--		} else {
--			buf = new char[strlen(szXDG)+strlen(szAbiDir)+4];
--			strcpy(buf, szXDG);
--		}
-+        private_dir += '/';
-+        private_dir += szAbiDir;
- 
--		strcat(buf, "/");
--		strcat(buf, szAbiDir);
--
--#ifdef PATH_MAX
--        if (strlen(buf) >= PATH_MAX)
--            DELETEPV(buf);
--#endif
--
--		// migration / legacy
--		migrate("/AbiSuite", szAbiDir, buf); 
-+        // migration / legacy
-+        // XXX shouldn't that be /.AbiSuite ?
-+        migrate("/AbiSuite", szAbiDir, private_dir.c_str());
-     }
- 
--	return buf;
-+    return private_dir.c_str();
- }
- 
- 
-Index: src/af/xap/xp/xap_App.h
-===================================================================
---- src/af/xap/xp/xap_App.h	(revision 35181)
-+++ src/af/xap/xp/xap_App.h	(working copy)
-@@ -178,7 +178,7 @@
- 
- 	virtual const XAP_StringSet *			getStringSet() const = 0;
- 	virtual void						migrate(const char *oldName, const char *newName, const char *path) const;
--	virtual const char *				getUserPrivateDirectory() = 0;
-+	virtual const char *				getUserPrivateDirectory() const = 0;
- 	virtual const char *				getAbiSuiteLibDir() const;
- 	virtual const char *				getAbiSuiteAppDir() const = 0;
- 	virtual bool					findAbiSuiteLibFile(std::string & path, const char * filename, const char * subdir = 0);
-Index: src/af/xap/win/xap_Win32App.h
-===================================================================
---- src/af/xap/win/xap_Win32App.h	(revision 35181)
-+++ src/af/xap/win/xap_Win32App.h	(working copy)
-@@ -65,7 +65,7 @@
- 	virtual void							pasteFromClipboard(PD_DocumentRange * pDocRange, bool, bool) = 0;
- 	virtual bool							canPasteFromClipboard(void) = 0;
- 	virtual void							cacheCurrentSelection(AV_View *) = 0;
--	virtual const char *					getUserPrivateDirectory(void);
-+	virtual const char *					getUserPrivateDirectory(void) const;
- 
- 	virtual HICON							getIcon(void) = 0;
- 	virtual HICON							getSmallIcon(void) = 0;
-Index: src/af/xap/win/xap_Win32App.cpp
-===================================================================
---- src/af/xap/win/xap_Win32App.cpp	(revision 35181)
-+++ src/af/xap/win/xap_Win32App.cpp	(working copy)
-@@ -238,7 +238,7 @@
- 	return result;
- }
- 
--const char * XAP_Win32App::getUserPrivateDirectory(void)
-+const char * XAP_Win32App::getUserPrivateDirectory(void) const
- {
- 	/* return a pointer to a static buffer */
- 
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 35181)
-+++ configure.ac	(working copy)
-@@ -616,7 +616,7 @@
- #
- 
- # We need libpng
--for l in libpng libpng14 libpng12; do
-+for l in libpng libpng16 libpng14 libpng12; do
-   AC_MSG_CHECKING(for $l)
-   if $PKG_CONFIG --exists $l ; then
-     AC_MSG_RESULT(yes)
-Index: plugins/xslfo/xp/ie_exp_XSL-FO.cpp
-===================================================================
---- plugins/xslfo/xp/ie_exp_XSL-FO.cpp	(revision 35181)
-+++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp	(working copy)
-@@ -1451,7 +1451,7 @@
- 	{ \
- 		UT_UTF8String esc = szValue; \
- 		esc.escapeXML(); \
--		buf += " "x"=\""; \
-+		buf += " " x"=\""; \
- 		buf += esc.utf8_str(); \
- 		buf += "\""; \
- 	}
-Index: plugins/latex/xp/ie_exp_LaTeX.cpp
-===================================================================
---- plugins/latex/xp/ie_exp_LaTeX.cpp	(revision 35181)
-+++ plugins/latex/xp/ie_exp_LaTeX.cpp	(working copy)
-@@ -1330,7 +1330,7 @@
- 	m_pie->write(sBuf.c_str(),sBuf.size());
- }
- 
--#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true;
-+#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true;
- #define SUBd(a,who) case a: subst = who; return true;
- static bool _convertLettersToSymbols(char c, const char *& subst)
- {
-Index: plugins/collab/backends/service/xp/soa_soup.cpp
-===================================================================
---- plugins/collab/backends/service/xp/soa_soup.cpp	(revision 35181)
-+++ plugins/collab/backends/service/xp/soa_soup.cpp	(working copy)
-@@ -163,7 +163,7 @@
- 	
- 	static bool _invoke(const std::string& /*url*/, const soa::method_invocation& /*mi*/, SoaSoupSession& sess, std::string& result) {
- 		if (!sess.m_session || !sess.m_msg )
--			return soa::GenericPtr();
-+			return false;
- 
- 		guint status = soup_session_send_message (sess.m_session, sess.m_msg);
- 		if (!(SOUP_STATUS_IS_SUCCESSFUL (status) ||
-Index: plugins/collab/backends/service/xp/RealmProtocol.cpp
-===================================================================
---- plugins/collab/backends/service/xp/RealmProtocol.cpp	(revision 35181)
-+++ plugins/collab/backends/service/xp/RealmProtocol.cpp	(working copy)
-@@ -6,8 +6,8 @@
- 
- #define MAX_PACKET_DATA_SIZE 64*1024*1024
- 		
--#define RPV1_PACKET_NONEXISTENT -2
--#define RPV1_PACKET_VARIABLE -1
-+#define RPV1_PACKET_NONEXISTENT uint32_t(-2)
-+#define RPV1_PACKET_VARIABLE uint32_t(-1)
- 	
- static uint32_t body_size[6] = {
- 	RPV1_PACKET_NONEXISTENT, /* 0: reserved */
diff --git a/abiword-3.0.1-gnutls.patch b/abiword-3.0.1-gnutls.patch
deleted file mode 100644
index 9b282c0..0000000
--- a/abiword-3.0.1-gnutls.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: plugins/collab/backends/service/xp/tls_tunnel.cpp
-===================================================================
---- plugins/collab/backends/service/xp/tls_tunnel.cpp	(revision 35191)
-+++ plugins/collab/backends/service/xp/tls_tunnel.cpp	(working copy)
-@@ -306,9 +306,6 @@
- 	disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr);		
- }
- 
--static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 };
--static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 };
--
- // FIXME: this clientproxy can only handle 1 SSL connection at the same time
- ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, 
- 		const std::string& ca_file, bool check_hostname)
-@@ -400,8 +397,6 @@
- 	// setup session
- 	return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t());
- 	return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t());
--	return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t());
--	return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t());
- 	return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t());
- 
- 	// setup transport
diff --git a/abiword-3.0.1-libwps-0.4.patch b/abiword-3.0.1-libwps-0.4.patch
deleted file mode 100644
index 292f681..0000000
--- a/abiword-3.0.1-libwps-0.4.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 6 Jun 2015 21:48:02 +0200
-Subject: [PATCH] adapt to libwps 0.4
-
----
- plugin-configure.m4                           | 2 +-
- plugins/wordperfect/plugin.m4                 | 2 +-
- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/plugin-configure.m4 b/plugin-configure.m4
-index 2757f4a..093fbcb 100644
---- a/plugin-configure.m4
-+++ b/plugin-configure.m4
-@@ -1470,7 +1470,7 @@ AC_SUBST([AIKSAURUS_LIBS])
- 
- 
- wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.3'
-+wordperfect_wps_pkgs='libwps-0.4'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
-index 0aadbaf..bc32d48 100644
---- a/plugins/wordperfect/plugin.m4
-+++ b/plugins/wordperfect/plugin.m4
-@@ -1,6 +1,6 @@
- 
- wordperfect_pkgs="libwpd-0.10 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.3'
-+wordperfect_wps_pkgs='libwps-0.4'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
-index bd19971..3e69f79 100644
---- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
-+++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
-@@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input)
- 	AbiWordperfectInputStream gsfInput(input);
- 
- 	libwps::WPSKind kind;
--	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
-+        libwps::WPSCreator creator;
-+        bool needsEncoding = false;
-+	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
- 	
- 	if (kind != libwps::WPS_TEXT)
- 		confidence = libwps::WPS_CONFIDENCE_NONE;
--- 
-2.4.2
-
diff --git a/abiword-3.0.1-parallel-make.patch b/abiword-3.0.1-parallel-make.patch
deleted file mode 100644
index 57608cb..0000000
--- a/abiword-3.0.1-parallel-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am	2013-02-19 18:39:42.000000000 -0600
-+++ b/src/Makefile.am	2015-04-21 21:36:37.504001500 -0500
-@@ -168,7 +168,7 @@ if HAVE_INTROSPECTION
- 
- INTROSPECTION_GIRS += Abi-@ABIWORD_SERIES@.gir
- 
--Abi_@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile
-+Abi-@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile
- Abi_@ABI_SUB_SERIES@_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gsf-1
- Abi_@ABI_SUB_SERIES@_gir_CFLAGS = $(libabiword_@ABIWORD_SERIES@_la_CPPFLAGS)
- Abi_@ABI_SUB_SERIES@_gir_LIBS = libabiword-@ABIWORD_SERIES@.la
diff --git a/abiword.spec b/abiword.spec
index 7554713..e13352a 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -1,12 +1,12 @@
 %define majorversion 3
 %define minorversion 0
-%define microversion 1
+%define microversion 2
 %define svnver 0
 
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 12%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -21,14 +21,6 @@ Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.8.3-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-3.0.0-librevenge.patch
-Patch4: abiword-3.0.0-link-grammar-5.patch
-Patch5: abiword-3.0.0-link-grammar-5-second.patch
-Patch6: abiword-3.0.0-libwp.patch
-Patch7: abiword-3.0.1-libwps-0.4.patch
-Patch8: abiword-3.0.1-gnutls.patch
-Patch9: abiword-3.0.1-gcc6.patch
-Patch10: abiword-3.0.1-fixwps.patch
-Patch11: abiword-3.0.1-parallel-make.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -115,17 +107,9 @@ Python bindings for developing with libabiword
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .boolean
 %patch3 -p0 -b .librevenge
-%patch4 -p1 -b .link-grammar-5
-%patch5 -p1 -b .link-grammar-5-second
-%patch6 -p1 -b .libwp
-%patch7 -p1 -b .libwps-0.4
-%patch8 -p0 -b .gnutls
-%patch9 -p0 -b .gcc6
-%patch10 -p1 -b .wps2
-%patch11 -p1 -b .pb
 
 # setup abiword documentation
-%setup -q -T -b 1 -n abiword-docs-%{version}
+%setup -q -T -b 1 -n abiword-docs-3.0.1
 %patch0 -p1 -b .windowshelppaths
 
 %build
@@ -139,7 +123,7 @@ autoreconf -vif
 make %{?_smp_mflags} V=1
 
 # build the documentation
-cd $RPM_BUILD_DIR/abiword-docs-%{version}
+cd $RPM_BUILD_DIR/abiword-docs-3.0.1
 ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 
 %install
@@ -192,7 +176,7 @@ SentUpstream: 2014-09-17
 EOF
 
 # install the documentation
-cd $RPM_BUILD_DIR/abiword-docs-%{version}
+cd $RPM_BUILD_DIR/abiword-docs-3.0.1
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help
 cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/
 # some of the help dirs have bad perms (#109261)
@@ -258,6 +242,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Tue Nov 29 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.2-1
+- Update to 3.0.2 stable
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.1-12
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/sources b/sources
index 5be6e78..d785acb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f3f8052e7b4979a43b75775a381e6cb8  abiword-3.0.1.tar.gz
-c9b78cb5f9c415ed63ce1cf9874fa8a4  abiword-docs-3.0.1.tar.gz
+cda6dd58c747c133b421cc7eb18f5796  abiword-3.0.2.tar.gz
+c92c0e1e2081db20757231a53d80c338  abiword-docs-3.0.2.tar.gz

From e2668f6c31009eeb6f2e31ed4eaccd1642d39a3d Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 30 Nov 2016 02:40:15 +0000
Subject: [PATCH 18/86] Run ldconfig for libabiword

---
 abiword.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index e13352a..9cbc7f9 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -208,6 +208,10 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
+%post -n libabiword -p /sbin/ldconfig
+
+%postun -n libabiword -p /sbin/ldconfig
+
 %files
 %{_bindir}/abiword
 %{_datadir}/appdata/*.appdata.xml
@@ -242,6 +246,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Tue Nov 29 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.2-2
+- Run ldconfig for libabiword
+
 * Tue Nov 29 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.2-1
 - Update to 3.0.2 stable
 

From 6a88dfb3cc7af339374b3c378bead10a133368c8 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 8 Dec 2016 03:03:22 +0000
Subject: [PATCH 19/86] Fix the black drawing regression with Gtk3.22

---
 ...d-3.0.2-fix-black-drawing-regression.patch | 54 +++++++++++++++++++
 abiword.spec                                  |  7 ++-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 abiword-3.0.2-fix-black-drawing-regression.patch

diff --git a/abiword-3.0.2-fix-black-drawing-regression.patch b/abiword-3.0.2-fix-black-drawing-regression.patch
new file mode 100644
index 0000000..dbce8c6
--- /dev/null
+++ b/abiword-3.0.2-fix-black-drawing-regression.patch
@@ -0,0 +1,54 @@
+From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001
+From: Hubert Figuiere <hub@figuiere.net>
+Date: Thu, 8 Dec 2016 02:03:10 +0000
+Subject: [PATCH] Bug 13815 - draw event should return TRUE
+
+This fix the black drawing regression with Gtk3.22
+
+git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
+---
+ src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++---
+ src/af/xap/gtk/xap_UnixFrameImpl.h   | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+index 780000e..10f8e00 100644
+--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
++++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
+ }
+ 
+ #if GTK_CHECK_VERSION(3,0,0)
+-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
++gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
+ #else
+-gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
++gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+ #endif
+ {
+ 	XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
+@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+ 		pView->draw(&rClip);
+ #endif
+ 	}
+-	return FALSE;
++	return TRUE;
+ }
+ 
+ static bool bScrollWait = false;
+diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
+index 30ee5d8..a0ff57f 100644
+--- a/src/af/xap/gtk/xap_UnixFrameImpl.h
++++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
+@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl
+ 			static gint key_release_event(GtkWidget* w, GdkEventKey* e);
+ 			static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
+ #if GTK_CHECK_VERSION(3,0,0)
+-			static gint draw(GtkWidget * w, cairo_t * cr);
++			static gboolean draw(GtkWidget * w, cairo_t * cr);
+ #else
+-			static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
++			static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
+ #endif
+ 			static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
+ 			static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);
diff --git a/abiword.spec b/abiword.spec
index 9cbc7f9..83fc03c 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -21,6 +21,7 @@ Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.8.3-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-3.0.0-librevenge.patch
+Patch4: abiword-3.0.2-fix-black-drawing-regression.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -107,6 +108,7 @@ Python bindings for developing with libabiword
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .boolean
 %patch3 -p0 -b .librevenge
+%patch4 -p1 -b .black
 
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-3.0.1
@@ -246,6 +248,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Wed Dec  7 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.2-3
+- Fix the black drawing regression with Gtk3.22
+
 * Tue Nov 29 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.2-2
 - Run ldconfig for libabiword
 

From 1e57ee2ff4b7e6b245dcdee70d878397fef32148 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Thu, 12 Jan 2017 17:30:23 +0100
Subject: [PATCH 20/86] Rebuild for readline 7.x

Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 83fc03c..53f7e8d 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -248,6 +248,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 1:3.0.2-4
+- Rebuild for readline 7.x
+
 * Wed Dec  7 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.2-3
 - Fix the black drawing regression with Gtk3.22
 

From 0d7cffe1ae9c0886f7116929a764752283c2ea8d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 05:41:11 +0000
Subject: [PATCH 21/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 53f7e8d..11b3a75 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -248,6 +248,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 1:3.0.2-4
 - Rebuild for readline 7.x
 

From 6eba5d500bde370ff4584c0206b4a31b551da3c4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 15 May 2017 20:10:09 +0000
Subject: [PATCH 22/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 11b3a75..3eed95c 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -248,6 +248,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 5d90ad5938a4ae0229b38805e4423272c007c81d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 02:31:24 +0000
Subject: [PATCH 23/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 3eed95c..d91325b 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -248,6 +248,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
 

From 04a3df853800cfb1dc64afdcc2c2b8d07d8cdff4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 2 Aug 2017 17:21:04 +0000
Subject: [PATCH 24/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index d91325b..d7d4d33 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -248,6 +248,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 8d0823f81e1c2a474227a97f957e9a34c707f624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 12 Aug 2017 14:07:10 -0400
Subject: [PATCH 25/86] Fix build

When the docs are unpacked as a separate directory, debugsources generation
fails. Simply moving it one level down fixes the issue.
---
 abiword.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index d7d4d33..6bb11aa 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -102,7 +102,7 @@ Python bindings for developing with libabiword
 
 %prep
 # setup abiword
-%setup -q
+%setup -q -a 1
 
 # patch abiword
 %patch1 -p1 -b .desktop
@@ -111,7 +111,7 @@ Python bindings for developing with libabiword
 %patch4 -p1 -b .black
 
 # setup abiword documentation
-%setup -q -T -b 1 -n abiword-docs-3.0.1
+cd abiword-docs-3.0.1
 %patch0 -p1 -b .windowshelppaths
 
 %build
@@ -125,7 +125,7 @@ autoreconf -vif
 make %{?_smp_mflags} V=1
 
 # build the documentation
-cd $RPM_BUILD_DIR/abiword-docs-3.0.1
+cd abiword-docs-3.0.1
 ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 
 %install
@@ -178,7 +178,7 @@ SentUpstream: 2014-09-17
 EOF
 
 # install the documentation
-cd $RPM_BUILD_DIR/abiword-docs-3.0.1
+cd abiword-docs-3.0.1
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help
 cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/
 # some of the help dirs have bad perms (#109261)

From af79af3444a7b82963b08d6bfb8af11520924ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 19 Aug 2017 09:38:00 -0400
Subject: [PATCH 26/86] Python 2 binary package renamed to python2-abiword

---
 abiword.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 6bb11aa..2aebc17 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -89,14 +89,15 @@ Requires: libabiword = %{epoch}:%{version}-%{release}
 Includes and definitions for developing with libabiword.
 
 
-%package -n python-abiword
+%package -n python2-abiword
+%{?python_provide:%python_provide python2-abiword}
 Summary: Python bindings for developing with libabiword
 Group: Development/Libraries
 Requires: libabiword = %{epoch}:%{version}-%{release}
 Obsoletes: pyabiword <= 0.8.0
 Provides: pyabiword > 0.8.0
 
-%description -n python-abiword
+%description -n python2-abiword
 Python bindings for developing with libabiword
 
 
@@ -244,10 +245,14 @@ fi
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 %{_datadir}/gir-1.0/Abi-3.0.gir
 
-%files -n python-abiword
+%files -n python2-abiword
 %{python_sitearch}/*
 
 %changelog
+* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:3.0.2-9
+- Python 2 binary package renamed to python2-abiword
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From c4cf962a721aa4b1164d404d6425cc04f95ca06b Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 7 Jan 2018 18:59:07 +0100
Subject: [PATCH 27/86] Remove obsolete scriptlets

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 abiword.spec | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 2aebc17..81dfda9 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -193,24 +193,6 @@ install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiwo
 find %{buildroot} -name '*.la' -delete
 find %{buildroot} -name '*.a' -delete
 
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-/usr/bin/update-desktop-database &> /dev/null || :
-
-%postun
-/usr/bin/update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-    /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-    /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
 %post -n libabiword -p /sbin/ldconfig
 
 %postun -n libabiword -p /sbin/ldconfig
@@ -249,6 +231,9 @@ fi
 %{python_sitearch}/*
 
 %changelog
+* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:3.0.2-10
+- Remove obsolete scriptlets
+
 * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:3.0.2-9
 - Python 2 binary package renamed to python2-abiword
   See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3

From b2119bb9933cf31339d2172a5ee045ea255f3527 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 01:45:12 +0000
Subject: [PATCH 28/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 81dfda9..019083c 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -231,6 +231,9 @@ find %{buildroot} -name '*.a' -delete
 %{python_sitearch}/*
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:3.0.2-10
 - Remove obsolete scriptlets
 

From 09ac06860aab257d78b5348682e5f7390acb10c1 Mon Sep 17 00:00:00 2001
From: Iryna Shcherbina <shcherbina.iryna@gmail.com>
Date: Wed, 7 Feb 2018 10:32:03 +0100
Subject: [PATCH 29/86] Update Python 2 dependency declarations to new
 packaging standards

---
 abiword.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 019083c..dbeffd0 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -56,9 +56,9 @@ BuildRequires: ots-devel
 BuildRequires: pkgconfig(libwps-0.4)
 BuildRequires: poppler-devel
 BuildRequires: popt-devel
-BuildRequires: pygobject3
+BuildRequires: python2-gobject
 BuildRequires: python2-devel
-BuildRequires: python-setuptools
+BuildRequires: python2-setuptools
 BuildRequires: readline-devel
 BuildRequires: t1lib-devel
 BuildRequires: telepathy-glib-devel
@@ -231,6 +231,10 @@ find %{buildroot} -name '*.a' -delete
 %{python_sitearch}/*
 
 %changelog
+* Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1:3.0.2-12
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 643886bee77323a06607f0bc35322727f0af072a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 28 Feb 2018 11:33:50 +0000
Subject: [PATCH 30/86] rebuild for fribidi

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index dbeffd0..7bfbd1f 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -231,6 +231,9 @@ find %{buildroot} -name '*.a' -delete
 %{python_sitearch}/*
 
 %changelog
+* Wed Feb 28 2018 Caolán McNamara <caolanm@redhat.com> - 1:3.0.2-13
+- rebuild for fribidi
+
 * Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1:3.0.2-12
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)

From cb7c84aa099c22cb8c0d9f3fd72bf030298dacc1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 12 Jul 2018 19:55:55 +0000
Subject: [PATCH 31/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 7bfbd1f..640f2bc 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -231,6 +231,9 @@ find %{buildroot} -name '*.a' -delete
 %{python_sitearch}/*
 
 %changelog
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 28 2018 Caolán McNamara <caolanm@redhat.com> - 1:3.0.2-13
 - rebuild for fribidi
 

From d87466de81c72231906a6597758f37f28830bb71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 17 Jul 2018 16:38:36 +0200
Subject: [PATCH 32/86] Update Python macros to new packaging standards

---
 abiword.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 640f2bc..692c44a 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -228,9 +228,13 @@ find %{buildroot} -name '*.a' -delete
 %{_datadir}/gir-1.0/Abi-3.0.gir
 
 %files -n python2-abiword
-%{python_sitearch}/*
+%{python2_sitearch}/*
 
 %changelog
+* Tue Jul 17 2018 Miro Hrončok <mhroncok@redhat.com> - 1:3.0.2-15
+- Update Python macros to new packaging standards
+  (See https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package)
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 36022def7a4329a81ec435709cd5d88d55721cd8 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 22 Jan 2019 18:38:28 +0100
Subject: [PATCH 33/86] Remove obsolete ldconfig scriptlets

References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 abiword.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 692c44a..e31c106 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -193,9 +193,7 @@ install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiwo
 find %{buildroot} -name '*.la' -delete
 find %{buildroot} -name '*.a' -delete
 
-%post -n libabiword -p /sbin/ldconfig
-
-%postun -n libabiword -p /sbin/ldconfig
+%ldconfig_scriptlets -n libabiword
 
 %files
 %{_bindir}/abiword

From db7b21fe870fc6e8bd2f1d9299418da416f7d330 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:38 +0100
Subject: [PATCH 34/86] Remove obsolete Group tag

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 abiword.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index e31c106..9ef65a7 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -8,7 +8,6 @@ Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
 Release: 15%{?dist}
 Epoch: 1
-Group: Applications/Editors
 License: GPLv2+
 URL: http://www.abisource.com/
 
@@ -74,7 +73,6 @@ while still remaining lean.
 
 %package -n libabiword
 Summary: Library for developing applications based on AbiWord's core
-Group: System Environment/Libraries
 
 %description -n libabiword
 Library for developing applications based on AbiWord's core.
@@ -82,7 +80,6 @@ Library for developing applications based on AbiWord's core.
 
 %package -n libabiword-devel
 Summary: Files for developing with libabiword
-Group: Development/Libraries
 Requires: libabiword = %{epoch}:%{version}-%{release}
 
 %description -n libabiword-devel
@@ -92,7 +89,6 @@ Includes and definitions for developing with libabiword.
 %package -n python2-abiword
 %{?python_provide:%python_provide python2-abiword}
 Summary: Python bindings for developing with libabiword
-Group: Development/Libraries
 Requires: libabiword = %{epoch}:%{version}-%{release}
 Obsoletes: pyabiword <= 0.8.0
 Provides: pyabiword > 0.8.0

From eac3def038536fab916305963df9a1245813b6ea Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 12:52:21 +0000
Subject: [PATCH 35/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 9ef65a7..5862ded 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.abisource.com/
@@ -225,6 +225,9 @@ find %{buildroot} -name '*.a' -delete
 %{python2_sitearch}/*
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Tue Jul 17 2018 Miro Hrončok <mhroncok@redhat.com> - 1:3.0.2-15
 - Update Python macros to new packaging standards
   (See https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package)

From 24b836ab12ea18ceecf37c2f4c0bf6881e0380d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Fri, 1 Feb 2019 11:29:05 +0100
Subject: [PATCH 36/86] Rebuilt for libwmf soname bump

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 5862ded..6e88dbc 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.abisource.com/
@@ -225,6 +225,9 @@ find %{buildroot} -name '*.a' -delete
 %{python2_sitearch}/*
 
 %changelog
+* Fri Feb 01 2019 Björn Esser <besser82@fedoraproject.org> - 1:3.0.2-17
+- Rebuilt for libwmf soname bump
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 2faf172334005db4dae31b6dd105606e6307cc9d Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 1 Feb 2019 11:32:35 +0100
Subject: [PATCH 37/86] Fix the build

Add missing gcc-c++ build dep.
---
 abiword.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/abiword.spec b/abiword.spec
index 6e88dbc..b39b688 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -36,6 +36,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: enchant-devel
 BuildRequires: flex
 BuildRequires: fribidi-devel
+BuildRequires: gcc-c++
 BuildRequires: gobject-introspection-devel
 BuildRequires: goffice-devel
 BuildRequires: gtk3-devel

From 452a13f81f5d4aa52b6224a54fa3b7318bc8345e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 1 Feb 2019 12:59:24 +0100
Subject: [PATCH 38/86] BR python-unversioned-command as a dirty workaround of
 severe FTBFS

---
 abiword.spec | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/abiword.spec b/abiword.spec
index b39b688..d941597 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -65,6 +65,10 @@ BuildRequires: telepathy-glib-devel
 BuildRequires: wv-devel
 BuildRequires: zlib-devel
 
+# the python2 module deoesn't build without this
+# TODO investigate, get rid of the depndency
+BuildRequires: python-unversioned-command
+
 Requires: libabiword = %{epoch}:%{version}-%{release}
 
 %description
@@ -116,6 +120,8 @@ cd abiword-docs-3.0.1
 # build libabiword and abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
 
+export PYTHON=%{__python2}
+
 autoreconf -vif
 
 %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
@@ -128,6 +134,7 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 
 %install
 cd $RPM_BUILD_DIR/abiword-%{version}
+export PYTHON=%{__python2}
 make install DESTDIR=%{buildroot}
 
 # Register as an application to be visible in the software center

From 3fd463e8b7042591d3b06ce18a2e903d2ec2cb19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Fri, 1 Feb 2019 12:56:43 +0100
Subject: [PATCH 39/86] Add patch to explicitly use python2 (#1671692)

---
 abiword-3.0.2-explicit-python2.patch |  8 ++++++++
 abiword.spec                         | 14 ++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 abiword-3.0.2-explicit-python2.patch

diff --git a/abiword-3.0.2-explicit-python2.patch b/abiword-3.0.2-explicit-python2.patch
new file mode 100644
index 0000000..6c7db3c
--- /dev/null
+++ b/abiword-3.0.2-explicit-python2.patch
@@ -0,0 +1,8 @@
+Index: abiword-3.0.2/src/gi-overrides/Makefile.am
+===================================================================
+--- abiword-3.0.2.orig/src/gi-overrides/Makefile.am
++++ abiword-3.0.2/src/gi-overrides/Makefile.am
+@@ -1,2 +1,2 @@
+-overridesdir = `python -c "import gi; print gi._overridesdir"`
++overridesdir = `$(PYTHON) -c "import gi; print gi._overridesdir"`
+ overrides_PYTHON = Abi.py
diff --git a/abiword.spec b/abiword.spec
index d941597..896c7e4 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.abisource.com/
@@ -21,6 +21,7 @@ Patch1: abiword-2.8.3-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-3.0.0-librevenge.patch
 Patch4: abiword-3.0.2-fix-black-drawing-regression.patch
+Patch5: abiword-3.0.2-explicit-python2.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -65,10 +66,6 @@ BuildRequires: telepathy-glib-devel
 BuildRequires: wv-devel
 BuildRequires: zlib-devel
 
-# the python2 module deoesn't build without this
-# TODO investigate, get rid of the depndency
-BuildRequires: python-unversioned-command
-
 Requires: libabiword = %{epoch}:%{version}-%{release}
 
 %description
@@ -111,6 +108,7 @@ Python bindings for developing with libabiword
 %patch2 -p1 -b .boolean
 %patch3 -p0 -b .librevenge
 %patch4 -p1 -b .black
+%patch5 -p1 -b .explicit_python2
 
 # setup abiword documentation
 cd abiword-docs-3.0.1
@@ -120,8 +118,6 @@ cd abiword-docs-3.0.1
 # build libabiword and abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
 
-export PYTHON=%{__python2}
-
 autoreconf -vif
 
 %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
@@ -134,7 +130,6 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 
 %install
 cd $RPM_BUILD_DIR/abiword-%{version}
-export PYTHON=%{__python2}
 make install DESTDIR=%{buildroot}
 
 # Register as an application to be visible in the software center
@@ -233,6 +228,9 @@ find %{buildroot} -name '*.a' -delete
 %{python2_sitearch}/*
 
 %changelog
+* Fri Feb 01 2019 Björn Esser <besser82@fedoraproject.org> - 1:3.0.2-18
+- Add patch to explicitly use python2 (#1671692)
+
 * Fri Feb 01 2019 Björn Esser <besser82@fedoraproject.org> - 1:3.0.2-17
 - Rebuilt for libwmf soname bump
 

From baa03149a78b65e05ae442b8a8f85168b451083e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 1 Feb 2019 18:28:29 +0000
Subject: [PATCH 40/86] Rebuilt for fixed libwmf soname

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 896c7e4..66e5c60 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 18%{?dist}
+Release: 19%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.abisource.com/
@@ -228,6 +228,9 @@ find %{buildroot} -name '*.a' -delete
 %{python2_sitearch}/*
 
 %changelog
+* Fri Feb 01 2019 Caolán McNamara <caolanm@redhat.com> - 1:3.0.2-19
+- Rebuilt for fixed libwmf soname
+
 * Fri Feb 01 2019 Björn Esser <besser82@fedoraproject.org> - 1:3.0.2-18
 - Add patch to explicitly use python2 (#1671692)
 

From d8495729ff1627873beaf61cdb7dd2c26e634cb2 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 17 Feb 2019 09:30:49 +0100
Subject: [PATCH 41/86] Rebuild for readline 8.0

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 66e5c60..96b61d2 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 19%{?dist}
+Release: 20%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.abisource.com/
@@ -228,6 +228,9 @@ find %{buildroot} -name '*.a' -delete
 %{python2_sitearch}/*
 
 %changelog
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:3.0.2-20
+- Rebuild for readline 8.0
+
 * Fri Feb 01 2019 Caolán McNamara <caolanm@redhat.com> - 1:3.0.2-19
 - Rebuilt for fixed libwmf soname
 

From 9da8b49de700b5fa2bf9b3ceef6a67dfa67a7c2b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 17:27:16 +0000
Subject: [PATCH 42/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 96b61d2..8e2cba1 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 20%{?dist}
+Release: 21%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.abisource.com/
@@ -228,6 +228,9 @@ find %{buildroot} -name '*.a' -delete
 %{python2_sitearch}/*
 
 %changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:3.0.2-20
 - Rebuild for readline 8.0
 

From 6b1444b6f003116ffbb84ea531b8f17a4ba08937 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 22 Jan 2020 20:46:12 +0000
Subject: [PATCH 43/86] 3.0.4, python3 gobject introspection bindings

---
 abiword-3.0.2-explicit-python2.patch          |  2 +-
 ...d-3.0.2-fix-black-drawing-regression.patch | 54 -------------------
 abiword.spec                                  | 45 ++++++++--------
 sources                                       |  4 +-
 4 files changed, 26 insertions(+), 79 deletions(-)
 delete mode 100644 abiword-3.0.2-fix-black-drawing-regression.patch

diff --git a/abiword-3.0.2-explicit-python2.patch b/abiword-3.0.2-explicit-python2.patch
index 6c7db3c..49ff7b1 100644
--- a/abiword-3.0.2-explicit-python2.patch
+++ b/abiword-3.0.2-explicit-python2.patch
@@ -4,5 +4,5 @@ Index: abiword-3.0.2/src/gi-overrides/Makefile.am
 +++ abiword-3.0.2/src/gi-overrides/Makefile.am
 @@ -1,2 +1,2 @@
 -overridesdir = `python -c "import gi; print gi._overridesdir"`
-+overridesdir = `$(PYTHON) -c "import gi; print gi._overridesdir"`
++overridesdir = `$(PYTHON) -c "import gi; print(gi._overridesdir)"`
  overrides_PYTHON = Abi.py
diff --git a/abiword-3.0.2-fix-black-drawing-regression.patch b/abiword-3.0.2-fix-black-drawing-regression.patch
deleted file mode 100644
index dbce8c6..0000000
--- a/abiword-3.0.2-fix-black-drawing-regression.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001
-From: Hubert Figuiere <hub@figuiere.net>
-Date: Thu, 8 Dec 2016 02:03:10 +0000
-Subject: [PATCH] Bug 13815 - draw event should return TRUE
-
-This fix the black drawing regression with Gtk3.22
-
-git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
----
- src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++---
- src/af/xap/gtk/xap_UnixFrameImpl.h   | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-index 780000e..10f8e00 100644
---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
- }
- 
- #if GTK_CHECK_VERSION(3,0,0)
--gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
-+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
- #else
--gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
-+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- #endif
- {
- 	XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
-@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- 		pView->draw(&rClip);
- #endif
- 	}
--	return FALSE;
-+	return TRUE;
- }
- 
- static bool bScrollWait = false;
-diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
-index 30ee5d8..a0ff57f 100644
---- a/src/af/xap/gtk/xap_UnixFrameImpl.h
-+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
-@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl
- 			static gint key_release_event(GtkWidget* w, GdkEventKey* e);
- 			static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
- #if GTK_CHECK_VERSION(3,0,0)
--			static gint draw(GtkWidget * w, cairo_t * cr);
-+			static gboolean draw(GtkWidget * w, cairo_t * cr);
- #else
--			static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
-+			static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
- #endif
- 			static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
- 			static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);
diff --git a/abiword.spec b/abiword.spec
index 8e2cba1..3bb06be 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -1,18 +1,18 @@
 %define majorversion 3
 %define minorversion 0
-%define microversion 2
+%define microversion 4
 %define svnver 0
 
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 21%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.abisource.com/
 
 Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
-Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
+Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-3.0.2.tar.gz
 Source11: abiword.mime
 Source12: abiword.keys
 Source13: abiword.xml
@@ -20,8 +20,8 @@ Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.8.3-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-3.0.0-librevenge.patch
-Patch4: abiword-3.0.2-fix-black-drawing-regression.patch
-Patch5: abiword-3.0.2-explicit-python2.patch
+Patch4: abiword-3.0.2-explicit-python2.patch
+Patch5: abiword-3.0.4-pygobject.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -41,7 +41,7 @@ BuildRequires: gcc-c++
 BuildRequires: gobject-introspection-devel
 BuildRequires: goffice-devel
 BuildRequires: gtk3-devel
-BuildRequires: gtkmathview-devel
+#BuildRequires: gtkmathview-devel
 BuildRequires: libgsf-devel
 BuildRequires: libpng-devel
 BuildRequires: librevenge-devel
@@ -54,12 +54,13 @@ BuildRequires: libxslt-devel
 BuildRequires: link-grammar-devel
 BuildRequires: loudmouth-devel
 BuildRequires: ots-devel
+BuildRequires: pkgconf-pkg-config
 BuildRequires: pkgconfig(libwps-0.4)
 BuildRequires: poppler-devel
 BuildRequires: popt-devel
-BuildRequires: python2-gobject
-BuildRequires: python2-devel
-BuildRequires: python2-setuptools
+BuildRequires: python3-gobject
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
 BuildRequires: readline-devel
 BuildRequires: t1lib-devel
 BuildRequires: telepathy-glib-devel
@@ -88,14 +89,12 @@ Requires: libabiword = %{epoch}:%{version}-%{release}
 Includes and definitions for developing with libabiword.
 
 
-%package -n python2-abiword
-%{?python_provide:%python_provide python2-abiword}
+%package -n python3-abiword
+%{?python_provide:%python_provide python3-abiword}
 Summary: Python bindings for developing with libabiword
 Requires: libabiword = %{epoch}:%{version}-%{release}
-Obsoletes: pyabiword <= 0.8.0
-Provides: pyabiword > 0.8.0
 
-%description -n python2-abiword
+%description -n python3-abiword
 Python bindings for developing with libabiword
 
 
@@ -107,8 +106,8 @@ Python bindings for developing with libabiword
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .boolean
 %patch3 -p0 -b .librevenge
-%patch4 -p1 -b .black
-%patch5 -p1 -b .explicit_python2
+%patch4 -p1 -b .explicit_python2
+%patch5 -p1 -b .pygo
 
 # setup abiword documentation
 cd abiword-docs-3.0.1
@@ -118,11 +117,9 @@ cd abiword-docs-3.0.1
 # build libabiword and abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
 
-autoreconf -vif
-
 %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
 
-make %{?_smp_mflags} V=1
+%{make_build} V=1
 
 # build the documentation
 cd abiword-docs-3.0.1
@@ -130,7 +127,7 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 
 %install
 cd $RPM_BUILD_DIR/abiword-%{version}
-make install DESTDIR=%{buildroot}
+%{make_install}
 
 # Register as an application to be visible in the software center
 #
@@ -224,10 +221,14 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 %{_datadir}/gir-1.0/Abi-3.0.gir
 
-%files -n python2-abiword
-%{python2_sitearch}/*
+%files -n python3-abiword
+%{python3_sitearch}/*
 
 %changelog
+* Fri Nov 29 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.4-1
+- Update to 3.0.4
+- Move to python3 gobject introspection bindings
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index d785acb..93895ad 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cda6dd58c747c133b421cc7eb18f5796  abiword-3.0.2.tar.gz
-c92c0e1e2081db20757231a53d80c338  abiword-docs-3.0.2.tar.gz
+SHA512 (abiword-3.0.4.tar.gz) = 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4
+SHA512 (abiword-docs-3.0.2.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5

From af40d2aae883f42122c5cf580e79153da17ddf81 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 22 Jan 2020 20:47:07 +0000
Subject: [PATCH 44/86] Disable gtkmathview plugins until requires issue is
 fixed

---
 abiword.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/abiword.spec b/abiword.spec
index 3bb06be..e7b1970 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -228,6 +228,7 @@ find %{buildroot} -name '*.a' -delete
 * Fri Nov 29 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.4-1
 - Update to 3.0.4
 - Move to python3 gobject introspection bindings
+- Disable gtkmathview plugins until requires issue is fixed
 
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

From a321b30d63633db0dd0416493743be69726d0cab Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 22 Jan 2020 21:01:27 +0000
Subject: [PATCH 45/86] add missing abiword-3.0.4-pygobject.patch

---
 abiword-3.0.4-pygobject.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 abiword-3.0.4-pygobject.patch

diff --git a/abiword-3.0.4-pygobject.patch b/abiword-3.0.4-pygobject.patch
new file mode 100644
index 0000000..0926131
--- /dev/null
+++ b/abiword-3.0.4-pygobject.patch
@@ -0,0 +1,22 @@
+From 51787d61993cb3981c18e4cf174fc229734fba1e Mon Sep 17 00:00:00 2001
+From: Jean Brefort <jean.brefort@normalesup.org>
+Date: Sun, 6 Dec 2015 11:04:10 +0000
+Subject: [PATCH] Update python override code. Fixes #13745 and #13746, thanks
+ to David Gutteridge.
+
+git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35171 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
+---
+ src/gi-overrides/Abi.py      | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/gi-overrides/Abi.py b/src/gi-overrides/Abi.py
+index 666fd61bf4..e3b61b9bf1 100644
+--- a/src/gi-overrides/Abi.py
++++ b/src/gi-overrides/Abi.py
+@@ -1,4 +1,6 @@
+ import sys
++import gi
++gi.require_version('Gtk', '3.0')
+ from gi.repository import Gtk
+ from ..overrides import override
+ from ..importer import modules

From 99b56fca58faa62ca042ae9f59797d931cc892a6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 11:07:30 +0000
Subject: [PATCH 46/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index e7b1970..7b284e4 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.abisource.com/
@@ -225,6 +225,9 @@ find %{buildroot} -name '*.a' -delete
 %{python3_sitearch}/*
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Fri Nov 29 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.4-1
 - Update to 3.0.4
 - Move to python3 gobject introspection bindings

From 41749cbce7f7d46c2ee561d14b30046e80daeeaf Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 29 Jan 2020 15:06:41 +0000
Subject: [PATCH 47/86] Packaging cleanups and py3 fixes

---
 abiword.spec | 54 +++++++---------------------------------------------
 1 file changed, 7 insertions(+), 47 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 7b284e4..77a09f4 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -6,7 +6,7 @@
 Summary: Word processing program
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.abisource.com/
@@ -16,6 +16,7 @@ Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-3
 Source11: abiword.mime
 Source12: abiword.keys
 Source13: abiword.xml
+
 Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.8.3-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
@@ -68,6 +69,7 @@ BuildRequires: wv-devel
 BuildRequires: zlib-devel
 
 Requires: libabiword = %{epoch}:%{version}-%{release}
+Requires: python3-gobject-base
 
 %description
 AbiWord is a cross-platform Open Source word processor. It is full-featured,
@@ -129,51 +131,6 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 cd $RPM_BUILD_DIR/abiword-%{version}
 %{make_install}
 
-# Register as an application to be visible in the software center
-#
-# NOTE: It would be *awesome* if this file was maintained by the upstream
-# project, translated and installed into the right place during `make install`.
-#
-# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-#
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<!--
-BugReportURL: http://bugzilla.abisource.com/show_bug.cgi?id=13672
-SentUpstream: 2014-09-17
--->
-<application>
-  <id type="desktop">abiword.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <description>
-    <p>
-      AbiWord is a free word processing program similar to Microsoft® Word.
-      It is suitable for a wide variety of word processing tasks.
-    </p>
-    <p>
-      AbiWord allows you to collaborate with multiple people on one document at the
-      same time.
-      It is tightly integrated with the AbiCollab.net web service, which lets you
-      store documents online, allows easy document sharing with your friends, and
-      performs format conversions on the fly.
-    </p>
-    <!-- FIXME: Probably needs another paragraph -->
-  </description>
-  <url type="homepage">http://www.abisource.com/</url>
-  <screenshots>
-  <!-- FIXME: Needs an official up to date screenshot -->
-    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/a.png</screenshot>
-    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/b.png</screenshot>
-    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/abiword/c.png</screenshot>
-  </screenshots>
-  <!-- FIXME: change this to an upstream email address for spec updates
-  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-   -->
-</application>
-EOF
-
 # install the documentation
 cd abiword-docs-3.0.1
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help
@@ -222,9 +179,12 @@ find %{buildroot} -name '*.a' -delete
 %{_datadir}/gir-1.0/Abi-3.0.gir
 
 %files -n python3-abiword
-%{python3_sitearch}/*
+%pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Wed Jan 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.4-3
+- Packaging cleanups and fixes
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From ace4550de8b7f126c8c5ec018c443b1f90b151c9 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 2 Feb 2020 14:57:02 +0000
Subject: [PATCH 48/86] a few more cleanups

---
 ...tch => abiword-3.0.2-explicit-python.patch |   0
 abiword.spec                                  | 166 ++++--------------
 sources                                       |   2 +-
 3 files changed, 31 insertions(+), 137 deletions(-)
 rename abiword-3.0.2-explicit-python2.patch => abiword-3.0.2-explicit-python.patch (100%)

diff --git a/abiword-3.0.2-explicit-python2.patch b/abiword-3.0.2-explicit-python.patch
similarity index 100%
rename from abiword-3.0.2-explicit-python2.patch
rename to abiword-3.0.2-explicit-python.patch
diff --git a/abiword.spec b/abiword.spec
index 77a09f4..40de642 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -1,18 +1,16 @@
-%define majorversion 3
-%define minorversion 0
-%define microversion 4
-%define svnver 0
+%define bigversion 3.0
+%define docsversion 3.0.1
 
-Summary: Word processing program
 Name: abiword
-Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 3%{?dist}
+Version: 3.0.4
+Release: 4%{?dist}
 Epoch: 1
+Summary: Word processing program
 License: GPLv2+
 URL: http://www.abisource.com/
 
 Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
-Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-3.0.2.tar.gz
+Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{docsversion}.tar.gz
 Source11: abiword.mime
 Source12: abiword.keys
 Source13: abiword.xml
@@ -21,11 +19,9 @@ Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.8.3-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-3.0.0-librevenge.patch
-Patch4: abiword-3.0.2-explicit-python2.patch
+Patch4: abiword-3.0.2-explicit-python.patch
 Patch5: abiword-3.0.4-pygobject.patch
 
-BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: aiksaurus-devel
 BuildRequires: aiksaurus-gtk-devel
 BuildRequires: asio-devel
@@ -42,6 +38,7 @@ BuildRequires: gcc-c++
 BuildRequires: gobject-introspection-devel
 BuildRequires: goffice-devel
 BuildRequires: gtk3-devel
+# Probably because it's gtk2 based
 #BuildRequires: gtkmathview-devel
 BuildRequires: libgsf-devel
 BuildRequires: libpng-devel
@@ -108,35 +105,34 @@ Python bindings for developing with libabiword
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .boolean
 %patch3 -p0 -b .librevenge
-%patch4 -p1 -b .explicit_python2
+%patch4 -p1 -b .explicit_python
 %patch5 -p1 -b .pygo
 
 # setup abiword documentation
-cd abiword-docs-3.0.1
+pushd abiword-docs-%{docsversion}
 %patch0 -p1 -b .windowshelppaths
+# some of the help dirs have bad perms (#109261)
+find . -type d -exec chmod -c o+rx {} \;
+popd
 
 %build
-# build libabiword and abiword
-cd $RPM_BUILD_DIR/abiword-%{version}
-
 %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
 
 %{make_build} V=1
 
 # build the documentation
-cd abiword-docs-3.0.1
+pushd abiword-docs-%{docsversion}
 ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
+popd
 
 %install
-cd $RPM_BUILD_DIR/abiword-%{version}
 %{make_install}
 
 # install the documentation
-cd abiword-docs-3.0.1
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help
-cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/
-# some of the help dirs have bad perms (#109261)
-find $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/ -type d -exec chmod -c o+rx {} \;
+pushd abiword-docs-%{docsversion}
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{bigversion}/AbiWord/help
+cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{bigversion}/AbiWord/help/
+popd
 
 install -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime
 install -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.keys
@@ -158,30 +154,33 @@ find %{buildroot} -name '*.a' -delete
 %{_datadir}/icons/hicolor/*/apps/abiword.png
 %{_datadir}/icons/hicolor/scalable/apps/abiword.svg
 # Abiword help
-%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord
+%{_datadir}/%{name}-%{bigversion}/AbiWord
 %{_mandir}/man1/abiword.1.gz
 
 %files -n libabiword
-%doc $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT
-%{_libdir}/libabiword-%{majorversion}.%{minorversion}.so
+%license COPYING COPYRIGHT.TXT
+%{_libdir}/libabiword-%{bigversion}.so
 %{_libdir}/libAiksaurusGtk3*
-%{_libdir}/%{name}-%{majorversion}.%{minorversion}
+%{_libdir}/%{name}-%{bigversion}
 %{_libdir}/girepository-1.0/Abi-3.0.typelib
-%{_datadir}/%{name}-%{majorversion}.%{minorversion}
+%{_datadir}/%{name}-%{bigversion}
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
 %{_datadir}/telepathy/clients/AbiCollab.client
 # Abiword help - included in GUI app
-%exclude %{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord
+%exclude %{_datadir}/%{name}-%{bigversion}/AbiWord
 
 %files -n libabiword-devel
-%{_includedir}/%{name}-%{majorversion}.%{minorversion}
-%{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
+%{_includedir}/%{name}-%{bigversion}
+%{_libdir}/pkgconfig/%{name}-%{bigversion}.pc
 %{_datadir}/gir-1.0/Abi-3.0.gir
 
 %files -n python3-abiword
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Sun Feb  2 2020 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.4-4
+- More packaging cleanups and fixes
+
 * Wed Jan 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.4-3
 - Packaging cleanups and fixes
 
@@ -339,108 +338,3 @@ find %{buildroot} -name '*.a' -delete
 
 * Mon Oct 14 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.0-1
 - Update to 3.0.0 stable
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.8.6-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 1:2.8.6-23
-- Rebuild for boost 1.54.0
-
-* Sun Feb 17 2013 Christoph Wickert <cwickert@fedoraproject.org> - 1:2.8.6-22
-- Make desktop file --vendor conditional
-- Remove obsolete category 'Applications" from desktop file
-
-* Sat Feb 09 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 1:2.8.6-21
-- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
-- clean up spec to follow current guidelines
-- remove obsolete and unapplied boolean patch
-
-* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 1:2.8.6-20
-- rebuild due to "jpeg8-ABI" feature drop
-
-* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1:2.8.6-19
-- rebuild against new libjpeg
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.8.6-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Feb 27 2012 Tom Callaway <spot@fedoraproject.org> - 1:2.8.6-17
-- fix build against modern glib, libpng
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.8.6-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1:2.8.6-15
-- Rebuild for new libpng
-
-* Tue Aug  9 2011 Peter Robinson <pbrobinson@gmail.com> - 1:2.8.6-14
-- rebuild with link-grammar now its back
-
-* Tue Aug  2 2011 Peter Robinson <pbrobinson@gmail.com> - 1:2.8.6-13
-- rebuild for new asio
-- drop obsolete OLPC and ARM includes
-
-* Tue Aug 02 2011 Marc Maurer <uwog@abisource.com> - 1:2.8.6-12
-- Fix a typo in the previous patch
-
-* Tue Aug 02 2011 Marc Maurer <uwog@abisource.com> - 1:2.8.6-11
-- Fix BZ 716005: --no-undefined is a linker flag, not a g++ flag
-
-* Tue Aug 02 2011 Marc Maurer <uwog@abisource.com> - 1:2.8.6-10
-- Mixed up the microversion and the release
-
-* Tue Aug 02 2011 Marc Maurer <uwog@abisource.com> - 1:2.8.6-9
-- Remove link-grammar from the BR and R until it is revived
-
-* Thu May 05 2011 Chris Tyler <chris@tylers.info> - 1:2.8.6-8
-- Excluded asio-devel from ARM builds
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.8.6-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Dec 30 2010 Peter Robinson <pbrobinson@gmail.com> - 1:2.8.6-6
-- Rebuild for library soname bumps
-
-* Wed Dec  8 2010 Caolán McNamara <caolanm@redhat.com> - 1:2.8.6-5
-- Rebuild for libwpd 0.9
-
-* Wed Dec  8 2010 Peter Robinson <pbrobinson@gmail.com> - 1:2.8.6-4
-- Rebuild for library soname bumps
-
-* Wed Sep 29 2010 jkeating - 1:2.8.6-3
-- Rebuilt for gcc bug 634757
-
-* Wed Sep 22 2010 Peter Robinson <pbrobinson@gmail.com> - 1:2.8.6-2
-- Move abiword gui help from the library to the app. Fixes 578596
-
-* Sat Aug 14 2010 Marc Maurer <uwog@abisource.com> - 1:2.8.6-1
-- New upstream release
-
-* Sat Jun 05 2010 Marc Maurer <uwog@abisource.com> - 1:2.8.5-1
-- New upstream release
-
-* Fri Apr 16 2010 Marc Maurer <uwog@abisource.com> - 1:2.8.4-1
-- New upstream release
-
-* Thu Apr 08 2010 Marc Maurer <uwog@abisource.com> - 1:2.8.3-2
-- Update .desktop patch
-
-* Thu Apr 08 2010 Marc Maurer <uwog@abisource.com> - 1:2.8.3-1
-- New upstream release
-
-* Tue Mar 02 2010 Marc Maurer <uwog@abisource.com> - 1:2.8.2-1
-- New upstream release
-- Package the man page
-
-* Wed Dec 23 2009 Rahul Sundaram <sundaram@fedoraproject.org> -1:2.8.1-4
-- Rebuild again since the wv soname bump was accidental
-- Remove superflous BuildRoot definitions and removals
-
-* Mon Dec 21 2009 Peter Robinson <pbrobinson@gmail.com> - 1:2.8.1-3
-- Rebuild against new libwv
-
-* Sun Nov 01 2009 Marc Maurer <uwog@abisource.com> - 1:2.8.1-2
-- Rebuild
-
-* Sun Nov 01 2009 Marc Maurer <uwog@abisource.com> - 1:2.8.1-1
-- New upstream release
diff --git a/sources b/sources
index 93895ad..440cebf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (abiword-3.0.4.tar.gz) = 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4
-SHA512 (abiword-docs-3.0.2.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5
+SHA512 (abiword-docs-3.0.1.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5

From 38cd4bc71a5afcd816736c39af5ab24339b8fee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 26 May 2020 02:39:57 +0200
Subject: [PATCH 49/86] Rebuilt for Python 3.9

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 40de642..33ca3b2 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -178,6 +178,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.0.4-5
+- Rebuilt for Python 3.9
+
 * Sun Feb  2 2020 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.4-4
 - More packaging cleanups and fixes
 

From f6c4fa0dec3afd40d81c2e855b2e8a7c304e57ec Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 22 Jun 2020 17:39:26 -0700
Subject: [PATCH 50/86] Fix build with recent ASIO and automake (#1817658)

Since automake is now newer than the version used to produce the
tarball, our patch that touches gi-overrides/Makefile.am causes
the build to fail - we need to run aclocal and automake to fix
this. To fix the ASIO-related build failure reported as #1817658
we have to build with `-DASIO_ENABLE_BOOST` - asio now uses
standalone mode automatically when C++11 or later is detected,
but it seems abiword can't build this way. See
https://github.com/chriskohlhoff/asio/commit/265e75cd and
https://github.com/openscenegraph/OpenSceneGraph/issues/921 for
more on that.
---
 abiword.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 33ca3b2..797b559 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -25,6 +25,8 @@ Patch5: abiword-3.0.4-pygobject.patch
 BuildRequires: aiksaurus-devel
 BuildRequires: aiksaurus-gtk-devel
 BuildRequires: asio-devel
+# Needed while explicit-python.patch touches gi-overrides/Makefile.am
+BuildRequires: automake
 BuildRequires: bison
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel
@@ -116,8 +118,12 @@ find . -type d -exec chmod -c o+rx {} \;
 popd
 
 %build
-%configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
+# Needed while explicit-python.patch touches gi-overrides/Makefile.am
+aclocal
+automake
 
+export CXXFLAGS="$RPM_OPT_FLAGS -DASIO_ENABLE_BOOST"
+%configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
 %{make_build} V=1
 
 # build the documentation

From a5d5f75ad7115a19a7992fd98d747c1bf3e96939 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 11:40:07 +0000
Subject: [PATCH 51/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 797b559..5022b9d 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -184,6 +184,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.0.4-5
 - Rebuilt for Python 3.9
 

From 0d468c8914be524dfb2dba8820e347663fa3e12f Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Mon, 27 Jul 2020 15:36:25 -0600
Subject: [PATCH 52/86] - Force C++14 as the code is not ready for C++17

---
 abiword.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 5022b9d..66cb3e8 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -122,7 +122,7 @@ popd
 aclocal
 automake
 
-export CXXFLAGS="$RPM_OPT_FLAGS -DASIO_ENABLE_BOOST"
+export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS -DASIO_ENABLE_BOOST"
 %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
 %{make_build} V=1
 
@@ -184,6 +184,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Mon Jul 27 2020 Jeff Law <law@redhat.com> - 1:3.0.4-7
+- Force C++14 as the code is not ready for C++17
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 5ca85291da755a1874a6a584833c2453448d4c01 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jul 2020 23:47:04 +0000
Subject: [PATCH 53/86] - Second attempt - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 66cb3e8..8c8c5aa 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -184,6 +184,10 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.4-8
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Mon Jul 27 2020 Jeff Law <law@redhat.com> - 1:3.0.4-7
 - Force C++14 as the code is not ready for C++17
 

From 447b7a3cef69e9782741c5ccf31b76770cd2d3ee Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 16 Dec 2020 22:15:48 +0000
Subject: [PATCH 54/86] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 abiword.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/abiword.spec b/abiword.spec
index 8c8c5aa..ee05ef4 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -66,6 +66,7 @@ BuildRequires: t1lib-devel
 BuildRequires: telepathy-glib-devel
 BuildRequires: wv-devel
 BuildRequires: zlib-devel
+BuildRequires: make
 
 Requires: libabiword = %{epoch}:%{version}-%{release}
 Requires: python3-gobject-base

From 0ec46942f8893fa79c42619c01f5ab1a299bf035 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 25 Jan 2021 23:43:55 +0000
Subject: [PATCH 55/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index ee05ef4..ff97505 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -185,6 +185,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.4-8
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

From 1d009a9be7c2cb7429f92c7ee3a5ceb4d1d328ea Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 21 Mar 2021 13:46:16 +0000
Subject: [PATCH 56/86] Add libgcrypt-devel build dep

---
 abiword.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/abiword.spec b/abiword.spec
index ff97505..efccd26 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -42,6 +42,7 @@ BuildRequires: goffice-devel
 BuildRequires: gtk3-devel
 # Probably because it's gtk2 based
 #BuildRequires: gtkmathview-devel
+BuildRequires: libgcrypt-devel
 BuildRequires: libgsf-devel
 BuildRequires: libpng-devel
 BuildRequires: librevenge-devel

From 9dd015611e98dad8c515577737de5f3054f04b79 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 4 Jun 2021 19:58:43 +0200
Subject: [PATCH 57/86] Rebuilt for Python 3.10

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index efccd26..a3eb50a 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1:3.0.4-10
+- Rebuilt for Python 3.10
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From ee622de5ae1debd9382b65bcebde3b254a51b72b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 12:15:52 +0000
Subject: [PATCH 58/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From b32100ebad5cf40c846867a1fefd29c927ce140f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 17:10:57 +0000
Subject: [PATCH 59/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index a3eb50a..e9fb878 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1:3.0.4-10
 - Rebuilt for Python 3.10
 

From f0e2a4d3fc412ebb05606002cd8dcc44823d496c Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sat, 23 Oct 2021 16:57:29 +0100
Subject: [PATCH 60/86] 3.0.5

---
 abiword.spec | 7 +++++--
 sources      | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index e9fb878..5ad15fb 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -2,8 +2,8 @@
 %define docsversion 3.0.1
 
 Name: abiword
-Version: 3.0.4
-Release: 11%{?dist}
+Version: 3.0.5
+Release: 1%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Sat Oct 23 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1:3.0.5-1
+- Update to 3.0.5
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 440cebf..0b0f5a3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (abiword-3.0.4.tar.gz) = 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4
+SHA512 (abiword-3.0.5.tar.gz) = a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6
 SHA512 (abiword-docs-3.0.1.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5

From 3ac733d8288ac204a2cb2cb5342228308f9bea7c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 20:50:50 +0000
Subject: [PATCH 61/86] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 5ad15fb..971f553 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Sat Oct 23 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1:3.0.5-1
 - Update to 3.0.5
 

From 2532877d8eb1524578f1be9467fa14eccf8e6667 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Mon, 13 Jun 2022 20:59:12 +0200
Subject: [PATCH 62/86] Rebuilt for Python 3.11

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 971f553..3471980 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:3.0.5-3
+- Rebuilt for Python 3.11
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From aaec86db0d9822d72831448377b3a0d3990f17cf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 20:21:32 +0000
Subject: [PATCH 63/86] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 3471980..0f1e5ba 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -186,6 +186,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitearch}/gi/overrides/Abi.py
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:3.0.5-3
 - Rebuilt for Python 3.11
 

From 2cdf9b2366e89329dba1d79541b2e8f012be8b65 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mon, 16 Jan 2023 20:10:42 -0500
Subject: [PATCH 64/86] Fix flatpak build

---
 abiword.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 0f1e5ba..799da52 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -125,7 +125,9 @@ aclocal
 automake
 
 export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS -DASIO_ENABLE_BOOST"
-%configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
+%configure \
+  --enable-plugins --enable-clipart --enable-templates --enable-introspection \
+  --with-gir-dir=%{_datadir}/gir-1.0 --with-typelib-dir=%{_libdir}/girepository-1.0
 %{make_build} V=1
 
 # build the documentation
@@ -134,7 +136,7 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 popd
 
 %install
-%{make_install}
+%{make_install} overridesdir=%{python3_sitelib}/gi/overrides
 
 # install the documentation
 pushd abiword-docs-%{docsversion}
@@ -163,7 +165,7 @@ find %{buildroot} -name '*.a' -delete
 %{_datadir}/icons/hicolor/scalable/apps/abiword.svg
 # Abiword help
 %{_datadir}/%{name}-%{bigversion}/AbiWord
-%{_mandir}/man1/abiword.1.gz
+%{_mandir}/man1/abiword.1*
 
 %files -n libabiword
 %license COPYING COPYRIGHT.TXT
@@ -183,7 +185,7 @@ find %{buildroot} -name '*.a' -delete
 %{_datadir}/gir-1.0/Abi-3.0.gir
 
 %files -n python3-abiword
-%pycached %{python3_sitearch}/gi/overrides/Abi.py
+%pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-4

From 1686779ebb3a9461843d0007973a4c926a364feb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 21:19:10 +0000
Subject: [PATCH 65/86] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 799da52..2c2e853 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPLv2+
@@ -188,6 +188,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 457c6b5a5bfff2e988fbce30498d214fd8c36572 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Wed, 8 Mar 2023 14:52:52 -0600
Subject: [PATCH 66/86] migrated to SPDX license

---
 abiword.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 2c2e853..c065889 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,10 +3,10 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 Summary: Word processing program
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://www.abisource.com/
 
 Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
@@ -188,6 +188,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Wed Mar 08 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:3.0.5-6
+- migrated to SPDX license
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From eee51f82bb4e2da12812054d13c0b808e2a14729 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Thu, 15 Jun 2023 17:00:03 +0200
Subject: [PATCH 67/86] Rebuilt for Python 3.12

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index c065889..7bbd542 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -188,6 +188,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1:3.0.5-7
+- Rebuilt for Python 3.12
+
 * Wed Mar 08 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:3.0.5-6
 - migrated to SPDX license
 

From 52591f2d9c73609c160395c551939a725851d90e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 12:49:09 +0000
Subject: [PATCH 68/86] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 7bbd542..813f3f4 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -188,6 +188,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1:3.0.5-7
 - Rebuilt for Python 3.12
 

From 57149a875dec5c87fe20f25ee1d4394eeafbddbd Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Mon, 6 Nov 2023 08:38:37 -0600
Subject: [PATCH 69/86] Drop i686

---
 abiword.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 813f3f4..1b5f4b4 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -15,6 +15,8 @@ Source11: abiword.mime
 Source12: abiword.keys
 Source13: abiword.xml
 
+ExcludeArch:    %{ix86}
+
 Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.8.3-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
@@ -188,6 +190,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Sat Nov 04 2023 Gwyn Ciesla <gwync@protonmail.com> 1:3.0.5-9
+- Drop i386 on f40+
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From a87d23c7af932bd2473edb27135c9905eab2d106 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Mon, 6 Nov 2023 08:45:12 -0600
Subject: [PATCH 70/86] Update patch macros

---
 abiword.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 1b5f4b4..7ad5ba6 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -108,15 +108,15 @@ Python bindings for developing with libabiword
 %setup -q -a 1
 
 # patch abiword
-%patch1 -p1 -b .desktop
-%patch2 -p1 -b .boolean
-%patch3 -p0 -b .librevenge
-%patch4 -p1 -b .explicit_python
-%patch5 -p1 -b .pygo
+%patch -P 1 -p1 -b .desktop
+%patch -P 2 -p1 -b .boolean
+%patch -P 3 -p0 -b .librevenge
+%patch -P 4 -p1 -b .explicit_python
+%patch -P 5 -p1 -b .pygo
 
 # setup abiword documentation
 pushd abiword-docs-%{docsversion}
-%patch0 -p1 -b .windowshelppaths
+%patch -P 0 -p1 -b .windowshelppaths
 # some of the help dirs have bad perms (#109261)
 find . -type d -exec chmod -c o+rx {} \;
 popd

From 496d4af51003cc5b97b89cec0a06ef30f36804dd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 12:02:03 +0000
Subject: [PATCH 71/86] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 7ad5ba6..0595c54 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -190,6 +190,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Nov 04 2023 Gwyn Ciesla <gwync@protonmail.com> 1:3.0.5-9
 - Drop i386 on f40+
 

From 552658332cb3bda6bed6831d1ef63af535eb9ac0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 22:33:59 +0000
Subject: [PATCH 72/86] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 0595c54..3ab4c57 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -190,6 +190,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From a872c697d4f1f72dc4ad1681d66f16bc11e948de Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Wed, 31 Jan 2024 15:59:06 -0600
Subject: [PATCH 73/86] Add missing include

---
 abiword.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 3ab4c57..5d7c84d 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -23,6 +23,7 @@ Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-3.0.0-librevenge.patch
 Patch4: abiword-3.0.2-explicit-python.patch
 Patch5: abiword-3.0.4-pygobject.patch
+Patch6: xml-inc.patch
 
 BuildRequires: aiksaurus-devel
 BuildRequires: aiksaurus-gtk-devel
@@ -113,6 +114,7 @@ Python bindings for developing with libabiword
 %patch -P 3 -p0 -b .librevenge
 %patch -P 4 -p1 -b .explicit_python
 %patch -P 5 -p1 -b .pygo
+%patch -P 6 -p0 -b .xml
 
 # setup abiword documentation
 pushd abiword-docs-%{docsversion}
@@ -190,6 +192,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Wed Jan 31 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:3.0.5-12
+- Add missing include
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 5bf9a4748fe00c76dc8c89c407086b2d651f8fad Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Wed, 31 Jan 2024 15:59:31 -0600
Subject: [PATCH 74/86] Add missing include

---
 xml-inc.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 xml-inc.patch

diff --git a/xml-inc.patch b/xml-inc.patch
new file mode 100644
index 0000000..549740f
--- /dev/null
+++ b/xml-inc.patch
@@ -0,0 +1,10 @@
+--- src/af/util/xp/ut_stringbuf.cpp~	2021-07-03 10:46:07.000000000 -0500
++++ src/af/util/xp/ut_stringbuf.cpp	2024-01-31 14:56:13.075934064 -0600
+@@ -26,6 +26,7 @@
+ #include <algorithm>
+ 
+ #include <libxml/uri.h>
++#include <libxml/globals.h>
+ 
+ #include <glib.h>
+ 

From 4ae5885f00d6b43dffaf15cfcf1aa30330ed388f Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Sat, 8 Jun 2024 22:30:49 +0200
Subject: [PATCH 75/86] Rebuilt for Python 3.13

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 5d7c84d..142434e 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -192,6 +192,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 1:3.0.5-13
+- Rebuilt for Python 3.13
+
 * Wed Jan 31 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:3.0.5-12
 - Add missing include
 

From 236d7c3486548e5c5585b7ec30e93d877cca8f61 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 16:30:35 +0000
Subject: [PATCH 76/86] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 142434e..d2e4c5a 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -192,6 +192,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 1:3.0.5-13
 - Rebuilt for Python 3.13
 

From fbec46193727e02322ca107fe126d1da41936aea Mon Sep 17 00:00:00 2001
From: Alexander Ploumistos <alexpl@fedoraproject.org>
Date: Sun, 8 Sep 2024 22:22:45 +0200
Subject: [PATCH 77/86] Rebuilt for goffice-0.10.57

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index d2e4c5a..6cf22cc 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -192,6 +192,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Sun Sep 08 2024 Alexander Ploumistos <alexpl@fedoraproject.org> - 1:3.0.5-15
+- Rebuilt for goffice-0.10.57
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 918145aef82421e16fed4052eecafd218c13ba2d Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Wed, 25 Sep 2024 09:55:56 -0500
Subject: [PATCH 78/86] Metainfo fix

---
 abiword.spec | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/abiword.spec b/abiword.spec
index 6cf22cc..5442ac5 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -71,6 +71,7 @@ BuildRequires: telepathy-glib-devel
 BuildRequires: wv-devel
 BuildRequires: zlib-devel
 BuildRequires: make
+BuildRequires: libappstream-glib
 
 Requires: libabiword = %{epoch}:%{version}-%{release}
 Requires: python3-gobject-base
@@ -156,11 +157,15 @@ install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiwo
 find %{buildroot} -name '*.la' -delete
 find %{buildroot} -name '*.a' -delete
 
+mkdir -p %{buildroot}%{_metainfodir}/
+mv %{buildroot}%{_datadir}/appdata/abiword.appdata.xml %{buildroot}%{_metainfodir}/
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdata.xml
+
 %ldconfig_scriptlets -n libabiword
 
 %files
 %{_bindir}/abiword
-%{_datadir}/appdata/*.appdata.xml
+%{_metainfodir}/abiword.appdata.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/mime-info/abiword.mime
 %{_datadir}/mime-info/abiword.keys
@@ -192,6 +197,9 @@ find %{buildroot} -name '*.a' -delete
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Tue Sep 24 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:3.0.5-16
+- Fix metainfo
+
 * Sun Sep 08 2024 Alexander Ploumistos <alexpl@fedoraproject.org> - 1:3.0.5-15
 - Rebuilt for goffice-0.10.57
 

From f8d69a795cedf33ac62eabec71e9bb2d92f35818 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Tue, 22 Oct 2024 13:03:37 -0500
Subject: [PATCH 79/86] Fix desktop filename

---
 abiword.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 5442ac5..9c0c74f 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -157,6 +157,8 @@ install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiwo
 find %{buildroot} -name '*.la' -delete
 find %{buildroot} -name '*.a' -delete
 
+mv %{buildroot}%{_datadir}/applications/abiword.desktop %{buildroot}%{_datadir}/applications/com.abisource.AbiWord.desktop
+
 mkdir -p %{buildroot}%{_metainfodir}/
 mv %{buildroot}%{_datadir}/appdata/abiword.appdata.xml %{buildroot}%{_metainfodir}/
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdata.xml
@@ -197,6 +199,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Tue Oct 22 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:3.0.5-17
+- Fix desktop filename
+
 * Tue Sep 24 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:3.0.5-16
 - Fix metainfo
 

From 3a0024b3ff276f838d1317cb0176d37f32fb7d72 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 10:28:39 +0000
Subject: [PATCH 80/86] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 9c0c74f..11576d5 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -199,6 +199,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Tue Oct 22 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:3.0.5-17
 - Fix desktop filename
 

From 88fa0e8b2751a26f0f9a266e029e4d78e9caad40 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Tue, 3 Jun 2025 14:28:23 +0200
Subject: [PATCH 81/86] Rebuilt for Python 3.14

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 11576d5..8e7e31b 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 18%{?dist}
+Release: 19%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -199,6 +199,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 1:3.0.5-19
+- Rebuilt for Python 3.14
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 1f8f7dd406e4c710b6c1d54ad66e37528b6b7de1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 16:42:18 +0000
Subject: [PATCH 82/86] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 8e7e31b..fff7242 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 19%{?dist}
+Release: 20%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -199,6 +199,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 1:3.0.5-19
 - Rebuilt for Python 3.14
 

From aab3747109ebdb1ef70e2ec56a062ac0dd2bc9ed Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 15 Aug 2025 12:37:41 +0200
Subject: [PATCH 83/86] Rebuilt for Python 3.14.0rc2 bytecode

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index fff7242..0918f96 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,7 +3,7 @@
 
 Name: abiword
 Version: 3.0.5
-Release: 20%{?dist}
+Release: 21%{?dist}
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
@@ -199,6 +199,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1:3.0.5-21
+- Rebuilt for Python 3.14.0rc2 bytecode
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.5-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

From 95e1c47100854b3c36fdc3c8d76589a54070b114 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Thu, 4 Sep 2025 13:34:54 -0500
Subject: [PATCH 84/86] 3.0.7

---
 .gitignore    |  1 +
 abiword.spec  | 52 +++++++++++++++++----------------------------------
 sources       |  3 +--
 xml-inc.patch | 10 ----------
 4 files changed, 19 insertions(+), 47 deletions(-)
 delete mode 100644 xml-inc.patch

diff --git a/.gitignore b/.gitignore
index a5f0a51..1f0fb78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /abiword-3.*.tar.gz
 /abiword-docs-3.*.tar.gz
+/AbiWord-release-3.0.7.tar.bz2
diff --git a/abiword.spec b/abiword.spec
index 0918f96..881f2ee 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -1,16 +1,19 @@
 %define bigversion 3.0
-%define docsversion 3.0.1
+
+%global forgeurl https://gitlab.gnome.org/World/AbiWord
 
 Name: abiword
-Version: 3.0.5
-Release: 21%{?dist}
+Version: 3.0.7
+Release: 1%{?dist}
+%global tag release-%{version}
+%forgemeta
+
 Epoch: 1
 Summary: Word processing program
 License: GPL-2.0-or-later
-URL: http://www.abisource.com/
+URL: %{forgeurl}
 
-Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
-Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{docsversion}.tar.gz
+Source0: %{forgesource}
 Source11: abiword.mime
 Source12: abiword.keys
 Source13: abiword.xml
@@ -23,13 +26,12 @@ Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-3.0.0-librevenge.patch
 Patch4: abiword-3.0.2-explicit-python.patch
 Patch5: abiword-3.0.4-pygobject.patch
-Patch6: xml-inc.patch
 
 BuildRequires: aiksaurus-devel
 BuildRequires: aiksaurus-gtk-devel
 BuildRequires: asio-devel
 # Needed while explicit-python.patch touches gi-overrides/Makefile.am
-BuildRequires: automake
+BuildRequires: automake autoconf libtool autoconf-archive
 BuildRequires: bison
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel
@@ -107,7 +109,7 @@ Python bindings for developing with libabiword
 
 %prep
 # setup abiword
-%setup -q -a 1
+%setup -qn AbiWord-release-%{version}
 
 # patch abiword
 %patch -P 1 -p1 -b .desktop
@@ -115,40 +117,21 @@ Python bindings for developing with libabiword
 %patch -P 3 -p0 -b .librevenge
 %patch -P 4 -p1 -b .explicit_python
 %patch -P 5 -p1 -b .pygo
-%patch -P 6 -p0 -b .xml
-
-# setup abiword documentation
-pushd abiword-docs-%{docsversion}
-%patch -P 0 -p1 -b .windowshelppaths
-# some of the help dirs have bad perms (#109261)
-find . -type d -exec chmod -c o+rx {} \;
-popd
 
 %build
 # Needed while explicit-python.patch touches gi-overrides/Makefile.am
-aclocal
-automake
+./autogen.sh
 
 export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS -DASIO_ENABLE_BOOST"
 %configure \
   --enable-plugins --enable-clipart --enable-templates --enable-introspection \
-  --with-gir-dir=%{_datadir}/gir-1.0 --with-typelib-dir=%{_libdir}/girepository-1.0
+  --with-gir-dir=%{_datadir}/gir-1.0 --with-typelib-dir=%{_libdir}/girepository-1.0 \
+  --enable-maintainer-mode
 %{make_build} V=1
 
-# build the documentation
-pushd abiword-docs-%{docsversion}
-ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
-popd
-
 %install
 %{make_install} overridesdir=%{python3_sitelib}/gi/overrides
 
-# install the documentation
-pushd abiword-docs-%{docsversion}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{bigversion}/AbiWord/help
-cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{bigversion}/AbiWord/help/
-popd
-
 install -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime
 install -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.keys
 install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiword.xml
@@ -174,8 +157,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat
 %{_datadir}/mime/packages/abiword.xml
 %{_datadir}/icons/hicolor/*/apps/abiword.png
 %{_datadir}/icons/hicolor/scalable/apps/abiword.svg
-# Abiword help
-%{_datadir}/%{name}-%{bigversion}/AbiWord
 %{_mandir}/man1/abiword.1*
 
 %files -n libabiword
@@ -187,8 +168,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat
 %{_datadir}/%{name}-%{bigversion}
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
 %{_datadir}/telepathy/clients/AbiCollab.client
-# Abiword help - included in GUI app
-%exclude %{_datadir}/%{name}-%{bigversion}/AbiWord
 
 %files -n libabiword-devel
 %{_includedir}/%{name}-%{bigversion}
@@ -199,6 +178,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Wed Sep 03 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:3.0.7-1
+- 3.0.7
+
 * Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1:3.0.5-21
 - Rebuilt for Python 3.14.0rc2 bytecode
 
diff --git a/sources b/sources
index 0b0f5a3..5450106 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (abiword-3.0.5.tar.gz) = a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6
-SHA512 (abiword-docs-3.0.1.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5
+SHA512 (AbiWord-release-3.0.7.tar.bz2) = 8cd75bcef936e8db1f859a8685e44c60b6f23a61a3bd702f320fa931dd645c85e9c2e671f870b7873ed57f37f75de71888f8a261cc6c97a58edf7af2114c26b7
diff --git a/xml-inc.patch b/xml-inc.patch
deleted file mode 100644
index 549740f..0000000
--- a/xml-inc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/af/util/xp/ut_stringbuf.cpp~	2021-07-03 10:46:07.000000000 -0500
-+++ src/af/util/xp/ut_stringbuf.cpp	2024-01-31 14:56:13.075934064 -0600
-@@ -26,6 +26,7 @@
- #include <algorithm>
- 
- #include <libxml/uri.h>
-+#include <libxml/globals.h>
- 
- #include <glib.h>
- 

From 24a516c8f1670006514d456bbb574ba458849e08 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 19 Sep 2025 12:06:15 +0200
Subject: [PATCH 85/86] Rebuilt for Python 3.14.0rc3 bytecode

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 881f2ee..41c5053 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -4,7 +4,7 @@
 
 Name: abiword
 Version: 3.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 %global tag release-%{version}
 %forgemeta
 
@@ -178,6 +178,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1:3.0.7-2
+- Rebuilt for Python 3.14.0rc3 bytecode
+
 * Wed Sep 03 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:3.0.7-1
 - 3.0.7
 

From d39127196a948478191666aaa62521df4e96b7ba Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:23:39 +0000
Subject: [PATCH 86/86] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 abiword.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abiword.spec b/abiword.spec
index 41c5053..58de5d6 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -4,7 +4,7 @@
 
 Name: abiword
 Version: 3.0.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 %global tag release-%{version}
 %forgemeta
 
@@ -178,6 +178,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/abiword.appdat
 %pycached %{python3_sitelib}/gi/overrides/Abi.py
 
 %changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1:3.0.7-2
 - Rebuilt for Python 3.14.0rc3 bytecode