diff --git a/abiword-2.5.2-defaultfont.patch b/abiword-2.5.2-defaultfont.patch
new file mode 100644
index 0000000..d783f87
--- /dev/null
+++ b/abiword-2.5.2-defaultfont.patch
@@ -0,0 +1,732 @@
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-am_ET libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-am_ET
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-am_ET 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-am_ET 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar_EG libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar_EG
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar_EG 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar_EG 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar_SA libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar_SA
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ar_SA 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ar_SA 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-bg_BG libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-bg_BG
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-bg_BG 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-bg_BG 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ca_ES libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ca_ES
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ca_ES 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ca_ES 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-cs_CZ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-cs_CZ
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-cs_CZ 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-cs_CZ 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-da_DK libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-da_DK
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-da_DK 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-da_DK 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_AT libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_AT
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_AT 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_AT 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_CH libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_CH
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_CH 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_CH 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_DE libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_DE
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-de_DE 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-de_DE 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-div_MV libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-div_MV
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-div_MV 2007-01-14 16:52:46.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-div_MV 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-el_GR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-el_GR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-el_GR 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-el_GR 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_AU libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_AU
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_AU 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_AU 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_CA libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_CA
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_CA 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_CA 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_GB libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_GB
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_GB 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_GB 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_IE libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_IE
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_IE 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_IE 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_NZ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_NZ
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_NZ 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_NZ 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_ZA libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_ZA
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-en_ZA 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-en_ZA 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_AR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_AR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_AR 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_AR 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_ES libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_ES
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_ES 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_ES 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_IR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_IR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_IR 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_IR 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_MX libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_MX
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-es_MX 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-es_MX 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fa_IR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fa_IR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fa_IR 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fa_IR 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fi_FI libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fi_FI
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fi_FI 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fi_FI 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_BE libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_BE
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_BE 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_BE 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_CA libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_CA
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_CA 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_CA 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_CH libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_CH
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_CH 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_CH 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_FR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_FR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-fr_FR 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-fr_FR 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-gl_ES libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-gl_ES
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-gl_ES 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-gl_ES 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-he libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-he
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-he 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-he 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-he_IL libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-he_IL
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-he_IL 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-he_IL 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-hu_HU libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-hu_HU
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-hu_HU 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-hu_HU 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-it_IT libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-it_IT
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-it_IT 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-it_IT 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ja_JP libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ja_JP
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ja_JP 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ja_JP 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-lt_LT libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-lt_LT
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-lt_LT 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-lt_LT 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nb_NO libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nb_NO
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nb_NO 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nb_NO 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nl_NL libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nl_NL
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nl_NL 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nl_NL 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nn_NO libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nn_NO
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-nn_NO 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-nn_NO 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pl_PL libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pl_PL
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pl_PL 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pl_PL 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ps libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ps
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ps 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ps 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pt_BR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pt_BR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pt_BR 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pt_BR 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pt_PT libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pt_PT
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-pt_PT 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-pt_PT 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ru libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ru
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ru 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ru 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ru_RU libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ru_RU
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ru_RU 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ru_RU 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sk_SK libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sk_SK
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sk_SK 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sk_SK 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sl libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sl
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sl 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sl 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sv libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sv
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sv 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sv 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sv_SE libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sv_SE
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-sv_SE 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-sv_SE 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-syr libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-syr
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-syr 2007-01-14 16:52:46.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-syr 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-tr libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-tr
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-tr 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-tr 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-tr_TR libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-tr_TR
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-tr_TR 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-tr_TR 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-uk_UA libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-uk_UA
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-uk_UA 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-uk_UA 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ur_PK libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ur_PK
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-ur_PK 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-ur_PK 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-yi libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-yi
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-yi 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-yi 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-zh_CN libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-zh_CN
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-zh_CN 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-zh_CN 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
+diff -u -r libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-zh_TW libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-zh_TW
+--- libabiword-2.5.2.svn20070903.orig/user/wp/templates/normal.awt-zh_TW 2007-01-20 17:20:58.000000000 +0100
++++ libabiword-2.5.2.svn20070903/user/wp/templates/normal.awt-zh_TW 2007-09-03 13:45:38.000000000 +0200
+@@ -9,7 +9,7 @@
+
+
+
+-
++
+
+
+
diff --git a/abiword-2.6.0.svn20071031-draghandles.patch b/abiword-2.6.0.svn20071031-draghandles.patch
new file mode 100644
index 0000000..7e47270
--- /dev/null
+++ b/abiword-2.6.0.svn20071031-draghandles.patch
@@ -0,0 +1,12 @@
+diff -u -r libabiword-2.6.0.svn20071031.orig/src/text/fmt/xp/fp_FrameContainer.h libabiword-2.6.0.svn20071031/src/text/fmt/xp/fp_FrameContainer.h
+--- libabiword-2.6.0.svn20071031.orig/src/text/fmt/xp/fp_FrameContainer.h 2007-10-31 19:19:23.000000000 +0100
++++ libabiword-2.6.0.svn20071031/src/text/fmt/xp/fp_FrameContainer.h 2007-10-31 19:21:40.000000000 +0100
+@@ -41,7 +41,7 @@
+ class fl_DocSectionLayout;
+ class fl_BlockLayout;
+
+-#define FRAME_HANDLE_SIZE 6
++#define FRAME_HANDLE_SIZE 20
+
+ class ABI_EXPORT fp_FrameContainer : public fp_VerticalContainer
+ {
diff --git a/abiword-2.6.0.svn20071031-nohtmloptions.patch b/abiword-2.6.0.svn20071031-nohtmloptions.patch
new file mode 100644
index 0000000..cf885cb
--- /dev/null
+++ b/abiword-2.6.0.svn20071031-nohtmloptions.patch
@@ -0,0 +1,12 @@
+diff -u -r libabiword-2.6.0.svn20071031.orig/src/wp/impexp/xp/ie_exp_HTML.h libabiword-2.6.0.svn20071031/src/wp/impexp/xp/ie_exp_HTML.h
+--- libabiword-2.6.0.svn20071031.orig/src/wp/impexp/xp/ie_exp_HTML.h 2007-10-31 19:19:23.000000000 +0100
++++ libabiword-2.6.0.svn20071031/src/wp/impexp/xp/ie_exp_HTML.h 2007-10-31 19:19:44.000000000 +0100
+@@ -39,7 +39,7 @@
+
+ /* Define if the [P/X]HTML export options dialog is implemented
+ */
+-#define HTML_DIALOG_OPTIONS
++//#define HTML_DIALOG_OPTIONS
+
+ /* Define if the tables are supported
+ */
diff --git a/abiword.spec b/abiword.spec
index e38cad6..685c91f 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -2,10 +2,12 @@
%define minorversion 6
%define microversion 4
+%define olpc_build 1
+
Summary: The AbiWord word processor
Name: abiword
-Version: 2.6.4
-Release: 1%{?dist}
+Version: %{majorversion}.%{minorversion}.%{microversion}
+Release: 2%{?dist}
Epoch: 1
Group: Applications/Editors
License: GPLv2+
@@ -14,17 +16,40 @@ Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-plugin
Source2: http://abisource.com/downloads/abiword/%{version}/source/abiword-extras-%{version}.tar.gz
Source3: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
Source11: abiword.mime
-Requires: mathml-fonts
-Requires: link-grammar >= 4.2.2
-
+Requires: libabiword = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libpng-devel
+URL: http://www.abisource.com/
+
+%description
+AbiWord is a cross-platform Open Source word processor. It is full-featured,
+while still remaining lean.
+
+%package -n libabiword
+Summary: Library for developing applications based on AbiWord's core
+Group: System Environment/Libraries
+Patch0: abiword-2.6.0-windowshelppaths.patch
+Patch1: abiword-2.6.0-desktop.patch
+Patch2: abiword-2.6.0-boolean.patch
+Patch3: abiword-plugins-2.6.0-boolean.patch
+%if %{olpc_build}
+Patch100: abiword-2.5.2-defaultfont.patch
+Patch101: abiword-2.6.0.svn20071031-draghandles.patch
+Patch102: abiword-2.6.0.svn20071031-nohtmloptions.patch
+%endif
+
+BuildRequires: autoconf, libtool
BuildRequires: desktop-file-utils
BuildRequires: fribidi-devel, enchant-devel, wv-devel
+BuildRequires: zlib-devel, popt-devel, libpng-devel
+BuildRequires: gtk2-devel, libgsf-devel, libglade2-devel
+BuildRequires: boost-devel
+%if %{olpc_build}
+BuildRequires: dbus-glib-devel >= 0.70
+%else
+Requires: mathml-fonts
+Requires: link-grammar >= 4.2.2
+BuildRequires: libgnomeui-devel
BuildRequires: libgnomeprintui22-devel
-BuildRequires: autoconf, libtool
-
-# some plugin build deps
BuildRequires: readline-devel
BuildRequires: bzip2-devel
BuildRequires: poppler-devel >= 0.4.0
@@ -36,24 +61,22 @@ BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel
BuildRequires: link-grammar-devel >= 4.2.2
BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison
BuildRequires: goffice04-devel
-BuildRequires: boost-devel
BuildRequires: loudmouth-devel
%if 0%{?fedora} >= 9
BuildRequires: asio-devel >= 0.3.8
%endif
+%endif
-# gnome build deps
-BuildRequires: libgnomeui-devel
-URL: http://www.abisource.com/
+%description -n libabiword
+Library for developing applications based on AbiWord's core.
-Patch0: abiword-2.6.0-windowshelppaths.patch
-Patch1: abiword-2.6.0-desktop.patch
-Patch2: abiword-2.6.0-boolean.patch
-Patch3: abiword-plugins-2.6.0-boolean.patch
+%package -n libabiword-devel
+Summary: Files for developing with libabiword
+Group: Development/Libraries
+Requires: libabiword = %{version}
-%description
-AbiWord is a cross-platform Open Source word processor. It is full-featured,
-while still remaining lean.
+%description -n libabiword-devel
+Includes and definitions for developing with libabiword.
%prep
# setup abiword
@@ -62,6 +85,11 @@ while still remaining lean.
%if 0%{?fedora} >= 9
%patch2 -p1 -b .boolean
%endif
+%if %{olpc_build}
+%patch100 -p1 -b .defaultfont
+%patch101 -p1 -b .draghandles
+%patch102 -p1 -b .nohtmloptions
+%endif
# setup abiword-plugins
%setup -q -T -b 1 -n abiword-plugins-%{version}
@@ -74,16 +102,24 @@ while still remaining lean.
%setup -q -T -b 3 -n abiword-docs-%{version}
%patch0 -p1 -b .windowshelppaths
-
%build
-# build abiword
+# build libabiword and abiword
cd $RPM_BUILD_DIR/abiword-%{version}
-%configure
+%if %{olpc_build}
+%configure --enable-libabiword --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing
+%else
+%configure --enable-libabiword
+%endif
make %{?_smp_mflags}
# build abiword-plugins
cd $RPM_BUILD_DIR/abiword-plugins-%{version}
-%configure --disable-gda --with-abiword=../abiword-%{version}
+export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}"
+%if %{olpc_build}
+CXXFLAGS="-L$RPM_BUILD_DIR/%{name}-%{version}/src/wp/main/unix/" %configure --enable-libabiword --disable-all --enable-abicollab --with-abicollab-sugar-backend --enable-loadbindings --enable-OpenDocument --with-abiword=$RPM_BUILD_DIR/%{name}-%{version}
+%else
+CXXFLAGS="-L$RPM_BUILD_DIR/%{name}-%{version}/src/wp/main/unix/" %configure --disable-gda --enable-libabiword --with-abiword=$RPM_BUILD_DIR/%{name}-%{version}
+%endif
# Remove libtool predep_objects and postdep_objects wonkiness so that
# building without -nostdlib doesn't include them twice. Because we
# already link with g++, weird stuff happens if you don't let the
@@ -97,9 +133,8 @@ make %{?_smp_mflags}
cd $RPM_BUILD_DIR/abiword-extras-%{version}
# abiword-extras looks at the abiword-%{version}.pc pkg-config file to get its location info
# however, that file is not installed yet, so just point to it in the abiword source tree
-export PKG_CONFIG_PATH="../%{name}-%{version}"
-# we need to re-autogen, as we have changed the destdir configuration
-./autogen.sh
+export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}"
+%configure
make
# build the documentation
@@ -112,6 +147,8 @@ rm -rf $RPM_BUILD_ROOT
# install abiword
cd $RPM_BUILD_DIR/abiword-%{version}
make install DESTDIR=$RPM_BUILD_ROOT
+# overwrite the static binary with the dynamic one
+mv -f $RPM_BUILD_DIR/abiword-%{version}/src/wp/main/unix/abiword-dynamic $RPM_BUILD_ROOT%{_bindir}/abiword
# Fix script permission
chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}-%{majorversion}.%{minorversion}/scripts/abw2html.pl
@@ -149,6 +186,8 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info
# nuke .la files
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la
+# nuke custom dictionary files
+rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml
%clean
rm -rf $RPM_BUILD_ROOT
@@ -161,19 +200,29 @@ update-desktop-database %{_datadir}/applications
%files
%defattr(-,root,root)
-%doc $RPM_BUILD_DIR/%{name}-%{version}/docs $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT
%{_bindir}/abiword
-%{_libdir}/%{name}-%{majorversion}.%{minorversion}
-%{_datadir}/%{name}-%{majorversion}.%{minorversion}
%{_datadir}/applications/*
%{_datadir}/mime-info/*
%{_datadir}/pixmaps/*png
%{_datadir}/icons/*png
-%ghost %{_includedir}/%{name}-%{majorversion}.%{minorversion}
-%ghost %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
-%ghost %{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml
+
+%files -n libabiword
+%doc $RPM_BUILD_DIR/%{name}-%{version}/docs $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT
+%{_libdir}/libabiword-%{majorversion}.%{minorversion}.so
+%{_libdir}/%{name}-%{majorversion}.%{minorversion}
+%{_datadir}/%{name}-%{majorversion}.%{minorversion}
+
+%files -n libabiword-devel
+%{_includedir}/%{name}-%{majorversion}.%{minorversion}
+%{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
%changelog
+* Sun Jul 20 2008 Marc Maurer - 1:2.6.4-2
+- Split off libabiword and libabiword-devel packages. Base the
+ abiword package on libabiword
+- Integrate the OLPC spec with the official Fedora spec to keep
+ the packages more in sync
+
* Sun Jul 13 2008 Marc Maurer - 1:2.6.4-1
- New upstream release