rpms/abiword/F-8 abiword-2.6.0-boolean.patch, NONE, 1.1 abiword-2.6.0-windowshelppaths.patch, NONE, 1.1 abiword-2.6.4-desktop.patch, NONE, 1.1 abiword-extras-2.6.4-nohash.patch, NONE, 1.1 abiword-plugins-2.6.0-boolean.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 abiword.spec, 1.45, 1.46 sources, 1.16, 1.17 abiword-2.0.9-windowshelppaths.patch, 1.1, NONE abiword-2.4.4-desktop.patch, 1.1, NONE abiword-2.4.6-fontmanager.patch, 1.1, NONE abiword-2.4.6-toc-layout.patch, 1.1, NONE
Marc Maurer (uwog)
fedora-extras-commits at redhat.com
Sun Jul 13 20:23:27 UTC 2008
- Previous message (by thread): rpms/subcommander/devel subcommander-2.0.0b3-var.patch, 1.1, 1.2 subcommander.spec, 1.13, 1.14
- Next message (by thread): rpms/andika-fonts/devel andika-fonts-fontconfig.conf, NONE, 1.1 andika-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: uwog
Update of /cvs/pkgs/rpms/abiword/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2868
Modified Files:
.cvsignore abiword.spec sources
Added Files:
abiword-2.6.0-boolean.patch
abiword-2.6.0-windowshelppaths.patch
abiword-2.6.4-desktop.patch abiword-extras-2.6.4-nohash.patch
abiword-plugins-2.6.0-boolean.patch
Removed Files:
abiword-2.0.9-windowshelppaths.patch
abiword-2.4.4-desktop.patch abiword-2.4.6-fontmanager.patch
abiword-2.4.6-toc-layout.patch
Log Message:
New upstream release
abiword-2.6.0-boolean.patch:
--- NEW FILE abiword-2.6.0-boolean.patch ---
diff -u -r abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h abiword-2.6.0/src/text/ptbl/xp/pd_Style.h
--- abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h 2008-03-18 23:16:20.000000000 +0100
+++ abiword-2.6.0/src/text/ptbl/xp/pd_Style.h 2008-03-25 17:14:23.000000000 +0100
@@ -23,6 +23,9 @@
#ifndef PD_STYLE_H
#define PD_STYLE_H
+#ifndef FALSE
+#define FALSE 0
+#endif /* FALSE */
#include "ut_types.h"
#include "pt_Types.h"
#include "ut_xml.h"
abiword-2.6.0-windowshelppaths.patch:
--- NEW FILE abiword-2.6.0-windowshelppaths.patch ---
diff -u -r abiword-docs-2.6.0.orig/ABW/fr-FR/howto/howtoword.abw abiword-docs-2.6.0/ABW/fr-FR/howto/howtoword.abw
--- abiword-docs-2.6.0.orig/ABW/fr-FR/howto/howtoword.abw 2008-03-18 23:19:26.000000000 +0100
+++ abiword-docs-2.6.0/ABW/fr-FR/howto/howtoword.abw 2008-03-25 16:17:20.000000000 +0100
@@ -23,7 +23,7 @@
<p style="Normal"><c props="lang:fr-FR">Il est presque inévitable qu'à un certain moment, vous aurez le besoin d'expédier un document que vous avez créé avec AbiWord à une personne utilisant Microsoft Word ou ouvrir un document créé avec Microsoft Word avec AbiWord. Heureusement, il est facile de réaliser ces transferts.</c><c props="lang:fr-FR"></c></p>
<p style="Heading 2"><c style="Heading 2" props="lang:fr-FR">Visualiser un document AbiWord avec Microsoft Word</c><c style="Heading 2" props="lang:fr-FR"></c></p>
<p style="Normal"><c props="lang:fr-FR">Jusqu'à ce que Microsoft annonce le support des fichiers d'AbiWord, les documents créés avec AbiWord nécessiteront d'être exportés dans un format que Word peut lire. L'enregistrement au format </c><c props="lang:fr-FR"></c><c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:fr-FR">Rich Text Format </c><c props="lang:fr-FR">permet de réaliser facilement cette exportation.</c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\howto\gettingstarted.abw.png_1" props="height:6.91in; width:5.63in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/gettingstarted.abw.png_1" props="height:6.91in; width:5.63in"/></p>
<p style="Normal"></p>
<p style="Normal"><c props="lang:fr-FR">Le format Rich Text est couramment utilisé par les produits Microsoft Office et ils n'auront aucune difficulté à importer les documents enregistrés ainsi.</c><c props="lang:fr-FR"></c></p>
<p style="Heading 2"><c style="Heading 2" props="lang:fr-FR">Visualiser les documents Word avec AbiWord</c><c style="Heading 2" props="lang:fr-FR"></c></p>
@@ -31,7 +31,7 @@
<p style="Normal"><c props="lang:fr-FR">Si vous rencontrez des problèmes, demandez à l'utilisateur de Word d'enregistrer le document au format </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">Rich Text Format (.rtf)</c><c props="lang:fr-FR">. Toutes les versions de Microsoft Word peuvent le faire et AbiWord peut ouvrir les fichiers RTF de manière fiable.</c></p>
</section>
<data>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\howto\gettingstarted.abw.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/gettingstarted.abw.png_1" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAhwAAAKXCAYAAADJiZNnAAAABmJLR0QA/wD/AP+gvaeTAAAA
CXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH0gUSDDMylHTKNAAAIABJREFUeJzsvV+oJcl5
4PlVcwzngh6qG2TUxgtbl9lmu+7QuOvONu6usbBKEuw0eGGEdmE07MO4C4tZ2TMsMy9m9bY9
diff -u -r abiword-docs-2.6.0.orig/ABW/fr-FR/interface/dialogreplace.abw abiword-docs-2.6.0/ABW/fr-FR/interface/dialogreplace.abw
--- abiword-docs-2.6.0.orig/ABW/fr-FR/interface/dialogreplace.abw 2008-03-18 23:19:26.000000000 +0100
+++ abiword-docs-2.6.0/ABW/fr-FR/interface/dialogreplace.abw 2008-03-25 16:17:20.000000000 +0100
@@ -16,7 +16,7 @@
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section>
<p style="Heading 1"><c props="lang:fr-CA"></c><c props="lang:fr-FR">Dialogue remplacer</c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\replace.png_0" props="height:1.77in; width:4.93in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/replace.png_0" props="height:1.77in; width:4.93in"/></p>
<p style="Heading 2"><c props="lang:fr-FR">Rechercher</c><c props="lang:fr-FR"></c></p>
<p style="Normal"><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">Entrez le mot que vous désirez rechercher dans cette boîte. Il s'agit de la chaîne de recherche. Cette commande recherche la chaîne de caractères ou de nombres que vous entrez. Ainsi, si vous recherchez </c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt"></c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">en</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">, vous trouverez les deux lettres au milieu du mot </c><c props="font-family:Times New Roman!
; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">dent</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt"> tout autant que le mot </c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">en</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">.</c></p>
<p style="Heading 2"><c props="lang:fr-FR">Respecter la casse</c><c props="lang:fr-FR"></c></p>
@@ -33,7 +33,7 @@
<p style="Normal"><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">Ce bouton ferme le dialogue </c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none"></c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; text-decoration:none">Remplacer</c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">.</c></p>
</section>
<data>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\replace.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/replace.png_0" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAdkAAACqCAIAAABu5KKOAAAaMElEQVR4nO2dX4gkx33Hfxfa
UAMXmDEyaPWknYcj2jFHtBMd6BaF6BzlQdgPtslDTn7KiRjspxDpIfjyEklvtgPByoOQYgg+
P8TS6cGnS/BFa5DZPdAxu7Dy3JhE3CxEeJbo2G7wQf/ABZuHqq6urv4zPT3d23u33w/LUl1d
diff -u -r abiword-docs-2.6.0.orig/ABW/fr-FR/interface/workspace.abw abiword-docs-2.6.0/ABW/fr-FR/interface/workspace.abw
--- abiword-docs-2.6.0.orig/ABW/fr-FR/interface/workspace.abw 2008-03-18 23:19:25.000000000 +0100
+++ abiword-docs-2.6.0/ABW/fr-FR/interface/workspace.abw 2008-03-25 16:17:20.000000000 +0100
@@ -23,24 +23,24 @@
<section header="26414915">
<p style="Heading 1"><c props="lang:fr-CA"></c><c props="lang:fr-FR">L'espace de travail d'AbiWord</c></p>
<p style="Normal"><c props="lang:fr-FR">AbiWord a une apparence très similaire à d'autres traitements de texte, ce qui, nous l'espérons, met à l'aise toute personne qui débute avec le logiciel.</c><c props="lang:fr-FR"></c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\full_window.png_1" props="height:4.14in; width:6.75in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/full_window.png_1" props="height:4.14in; width:6.75in"/></p>
<p style="Normal"><c props="lang:fr-FR">L'interface familière devrait permettre à la plupart des personnes de démarrer le travail immédiatement. Cependant, certaines caractéristiques sont peut-être nouvelles.</c><c props="lang:fr-FR"></c></p>
<p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Titre de fenêtre</c><c props="lang:fr-FR"></c></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\titlebar.png_1" props="height:0.23in; width:6.73in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/titlebar.png_1" props="height:0.23in; width:6.73in"/></p>
<p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">La fenêtre de titre est similaire à cette de toute autre application, avec une différence toutefois. Notez le caractère </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">*</c><c props="lang:fr-FR"> près de </c><c props="font-style:italic; lang:fr-FR">Document10</c><c props="lang:fr-FR">. L'astérique signifie que </c><c props="font-style:italic; lang:fr-FR">Document10</c><c props="lang:fr-FR"> a été modifié. Ceci fourni un manière simple d'identifier si le document doit être enregistré.</c></p>
<p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Les barres de fonction</c><c props="lang:fr-FR"></c></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars.png_1" props="height:0.98in; width:6.63in"/><c props="lang:fr-FR">Voici les trois plus importantes barres de fonctions. La première, nommée barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est préférable d'y débuter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.</c><c props="lang:fr-FR"></c></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars.png_1" props="height:0.98in; width:6.63in"/><c props="lang:fr-FR">Voici les trois plus importantes barres de fonctions. La première, nommée barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est préférable d'y débuter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.</c><c props="lang:fr-FR"></c></p>
<p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">La seconde est la barre d'outils standard et la troisième (au bas) est la barre d'outils de mise en forme.</c><c props="lang:fr-FR"></c></p>
<p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Manipuler les barres</c><c props="lang:fr-FR"></c></p>
<p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">AbiWord permet de cacher les barres. Si certaines manquent ou ne sont pas requises vérifiez le menu </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">Affichage</c><c props="lang:fr-FR"> > </c><c props="font-style:italic; lang:fr-FR">Barres d'outils</c><c props="lang:fr-FR">.</c></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars_hiding.png_1" props="height:3.19in; width:5.76in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars_hiding.png_1" props="height:3.19in; width:5.76in"/></p>
<p style="Heading 2"><c props="lang:fr-FR">Barre de saisie</c><c props="lang:fr-FR"></c></p>
<p style="Normal"><image dataid="/usr/src/abiword/commit/images/grabbar_shaded.png_0" props="height:1.08in; width:1.35in"/></p>
<p style="Normal"><c props="lang:fr-FR">Pour ceux qui exécutent AbiWord sous GNOME, La barre de saisie localisée à l'extrémité gauche de chaque barre d'outils représente une manières simple offerte à chacun de modifier l'interface à leur convenance. Cliquez la barre de saisie et déplacez-là . La barre d'outils suivra la souris, permettant même à la barre d'outil de survoler une partie quelconque de l'écran.</c><c props="lang:fr-FR"></c></p>
<p style="Heading 2"><c props="lang:fr-FR">Barre d'état</c><c props="lang:fr-FR"></c></p>
<p style="Normal"><image dataid="/usr/src/abiword/commit/images/statusbar.png_0" props="height:0.22in; width:5.04in"/></p>
<p style="Normal"><c props="lang:fr-FR">La barre d'état permet une vue rapide de l'état du document. A la gauche, AbiWord note la page courante. La boîte du milieu, qui est habituellement vide, affiche un message d'aide rapide décrivant l'option de menu courante.</c><c props="lang:fr-FR"></c></p>
-<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\statusbar_quickhelp.png_1" props="height:1.61in; width:6.49in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/statusbar_quickhelp.png_1" props="height:1.61in; width:6.49in"/></p>
<p style="Heading 2"><c props="lang:fr-FR">Les règles</c><c props="lang:fr-FR"></c></p>
<p style="Normal"><image dataid="/usr/src/abiword/commit/images/ruler.png_0" props="height:0.32in; width:5.55in"/></p>
<p style="Normal"><c props="lang:fr-FR">En employant les règles, il devient facile de fixer les marges de la page et les tabulations.</c><c props="lang:fr-FR"></c></p>
@@ -49,7 +49,7 @@
<p style="Normal" props="text-align:left"></p>
</section>
<data>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\full_window.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/full_window.png_1" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAogAAAGNCAIAAAAdDhfDAAAgAElEQVR4nOy9bWwcx5ku+mjR
vqgJmMWMoSw4gh1oCFnIkLZhkhtBGkbBmjoOYDpZwKIdwGZ8FgnlBDYdX2Qt70EiO4u7trPY
WE5wEmuDxKKDbEQZiCXqIpaYQDozOpB2hoKU4QSSyTFsg0NsBDcRE5rGCeEuXDWg+6O6q6ur
@@ -732,7 +732,7 @@
Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW
iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg==
</d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars_hiding.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars_hiding.png_1" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAikAAAEyCAIAAACwCNeMAAAACXBIWXMAAABEAAAARACdvuRJ
AABTv0lEQVR42u29f2wcx5nn/bXQflGzYF4MDSfgGEngIbJGKCbGSrw1LCoJTtRqcWHWC1hO
Foi8uRf2yA4SOTns2flj3yR3eC82Du+beA/5oQTrFWXsxT+AtS0DF1kXREdqYYekYYecQAo1
@@ -1135,7 +1135,7 @@
MThhNzQ3OWNiNDVjMWM4ZjU4ODEwMjAxODdiNmZkOGRmYmNlZGIwNjWQ4/dNAAAAAElFTkSu
QmCC
</d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars.png_1" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAnwAAABeCAIAAAA2dF4VAAAACXBIWXMAAABEAAAARACdvuRJ
AABD6UlEQVR42u29fYwc1Zkv/HNUXFVHzlWPBdG0BZG7BRY9DVZmOrGYmQVdZjbRzZi9EraJ
BEPeVRgDAjtIiU1WiSHRrk1WG5tEy8VEITNcZRk7UrDNVRhPInO7/cpst9FAz0SGno4ATVvB
@@ -1496,7 +1496,7 @@
DARcAEBsLLAFAABFC65ZAT5ljHl7Cpt/HGtWAABrMLOCaDgEBABIgTUriEbi4lkAQPkIK4iC
QzsAgFT+AnafvftOpg+NAAAAAElFTkSuQmCC
</d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\titlebar.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/titlebar.png_1" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAoYAAAAWCAIAAADSEcpEAAAACXBIWXMAAABEAAAARACdvuRJ
AAAKN0lEQVR42u2dXYjc1hXH/wEFjmACEriwAy10TAlxHEq9bgO2ScBx85AtLsROXtYkD0me
4rSQ2n0o5CnYD/1wCiHbQogTKN0EanYWmnobanZcajxbutkZ8McqtCYa6IIGvFgXMqADvg99
@@ -1550,7 +1550,7 @@
N2NlNzE0YWQwMjdlM2M5MWZiMjk0ZTc2ZDNlNDU2ZmQxMjFjZmE4ODZiNWRlMGUzZTNmZjhm
ZTJhZTY0MmU4HyCiUgAAAABJRU5ErkJggg==
</d>
-<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\statusbar_quickhelp.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/statusbar_quickhelp.png_1" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAm8AAACbCAIAAAC7yOv5AAAACXBIWXMAAABEAAAARACdvuRJ
AAAqpUlEQVR42u2df2hlx5XnT4cbqAcaeDJOkGB3icTSxFII69Zug92TMN2eXkgvXoiT/LEd
ZiBW40DayZCN88eS5J9J+4/9kVmSuGdYY7VhZ+3ABsuwiXuH9LZ6iSMpuEfS0G31M4nRE6yZ
diff -u -r abiword-docs-2.6.0.orig/ABW/pl-PL/howto/howtoword.abw abiword-docs-2.6.0/ABW/pl-PL/howto/howtoword.abw
--- abiword-docs-2.6.0.orig/ABW/pl-PL/howto/howtoword.abw 2008-03-18 23:19:15.000000000 +0100
+++ abiword-docs-2.6.0/ABW/pl-PL/howto/howtoword.abw 2008-03-25 16:17:21.000000000 +0100
@@ -24,7 +24,7 @@
<p style="Heading 2"><c style="Heading 2" props="lang:en-US">Podgląd dokumentów AbiWorda w programie Microsoft Word</c></p>
<p style="Normal"><c props="lang:en-US">Jakkolwiek Microsoft zapowiada wsparcie dla plików AbiWorda, to przede wszystkim dokumenty tworzone w AbiWordzie powinny być eksportowane do formatu czytelnego dla programu Microsoft Word. Najłatwiej to zrobić przez zapisanie pliku w postaci Rich Text Format.</c></p>
<p style="Normal"></p>
-<p style="Normal"><image dataid="E:\nowyAbiWord\abiword-doc\docs 9.1\ok---howto\howtoword.png_0" props="height:3.40in; width:5.04in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/howtoword.png_0" props="height:3.40in; width:5.04in"/></p>
<p style="Normal"></p>
<p style="Normal"><c props="lang:en-US">Rich Text Format często jest używany przez pakiet oprogramowania biurowego firmy Microsoft i nie będzie problemów z importem dokumentów zapisanych w ten sposób.</c></p>
<p style="Heading 2"><c style="Heading 2" props="lang:en-US">Podgląd dokumentów Microsoft Word w AbiWordzie</c></p>
@@ -32,7 +32,7 @@
<p style="Normal"><c props="lang:en-US">Jeśli napotykasz problemy, to poproś użytkownika programu Microsoft Word, aby zapisywał dokumenty jako Rich Text Format (.rtf). Wszystkie wersje programu Microsoft Word mogą zapisywać pliki w tym formacie, a AbiWord potrafi wiernie odczytywać pliki typu RTF.</c></p>
</section>
<data>
-<d name="E:\nowyAbiWord\abiword-doc\docs 9.1\ok---howto\howtoword.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/howtoword.png_0" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAl0AAAGYCAIAAAGAKvBwAAAACXBIWXMAAAsSAAALEgHS3X78
AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXQUxbru6Z59Jvu+IU9Qr7jh8Yrg
Coq4IKiIinAFFFxYghCQhASyEQj7GgKB7CsJgYCAEJLM9ARCUNGrjyvi9TxChCBclsBlMWzp
diff -u -r abiword-docs-2.6.0.orig/ABW/pl-PL/interface/workspace.abw abiword-docs-2.6.0/ABW/pl-PL/interface/workspace.abw
--- abiword-docs-2.6.0.orig/ABW/pl-PL/interface/workspace.abw 2008-03-18 23:19:16.000000000 +0100
+++ abiword-docs-2.6.0/ABW/pl-PL/interface/workspace.abw 2008-03-25 16:17:21.000000000 +0100
@@ -25,24 +25,24 @@
<p style="Heading 1"><c props="lang:pl-PL">Obszar roboczy </c><c props="lang:pl-PL"></c>AbiWorda</p>
<p style="Normal">Obszar roboczy jest podobny do tych, jakie znamy z innych edytorów tekstu. Dlatego każdy nowy użytkownik <c props="lang:en-US">AbiWorda może się czuć jak u siebie w domu</c><c props="lang:en-US"></c>.</p>
<p style="doc_normal"></p>
-<p style="doc_normal" props="text-indent:0.0000in; text-align:center"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\full_window.png_0" props="height:3.68in; width:6.96in"/></p>
+<p style="doc_normal" props="text-indent:0.0000in; text-align:center"><image dataid="/usr/src/abiword/commit/full_window.png_0" props="height:3.68in; width:6.96in"/></p>
<p style="doc_normal"></p>
<p level="1" listid="0" parentid="0" style="Normal">Znajomy interfejs pozwala większości użytkownikom <c props="lang:en-US">od razu rozpocząć pracę</c><c props="lang:en-US"></c>. Tym niemniej niektóre możliwości będą nowością.</p>
<p level="1" listid="0" parentid="0" style="Normal"></p>
<p level="1" listid="0" parentid="0" style="Heading 3">Okno tytułu</p>
<p level="1" listid="0" parentid="0" style="doc_normal" props="text-indent:-0.5000in"></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\titlebar.png_0" props="height:0.25in; width:6.99in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/titlebar.png_0" props="height:0.25in; width:6.99in"/></p>
<p level="1" listid="0" parentid="0" style="Normal"></p>
<p level="1" listid="0" parentid="0" style="Normal">Okno tytułu jest podobne do okien innych aplikacji, z jedną jednak różnicą. Zwóć uwagę na gwiazdkę * obok “Dokument_10“. Gwiazdka oznacza, że “Dokument_10“ został zmodyfikowany. W ten prosty sposób AbiWord podpowiada ci, że dokument powinien być zapisany.</p>
<p level="1" listid="0" parentid="0" style="Heading 3">Paski funkcji</p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars.png_0" props="height:0.90in; width:6.99in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars.png_0" props="height:0.90in; width:6.99in"/></p>
<p level="1" listid="0" parentid="0" style="Normal"></p>
<p level="1" listid="0" parentid="0" style="Normal">Oto trzy podstawowe paski funkcji. Pierwszy, nazywany Paskiem Menu, to najlepsze miejsce, by zapoznać się z AbiWordem. Najlepiej po prostu przejrzyj każde menu, wtedy poznasz wszystkie komendy, jakich AbiWord może użyć do dokumentów.</p>
<p level="1" listid="0" parentid="0" style="Normal">Drugi to pasek “Standardowyâ€, trzeci z wyżej pokazanych (na dole) to pasek "Formatowanie".</p>
<p level="1" listid="0" parentid="0" style="Heading 3">Paski robocze</p>
<p level="1" listid="0" parentid="0" style="Normal">AbiWord pozwala na ukrywanie pasków narzędzi. Jeśli któregoś brakuje albo nie jest potrzebny, sprawdź w Widok > Paski narzędzi.</p>
<p level="1" listid="0" parentid="0" style="Normal"></p>
-<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars_hiding.png_1" props="height:1.67in; width:3.54in"/></p>
+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars_hiding.png_1" props="height:1.67in; width:3.54in"/></p>
<p style="Heading 3">Pasek uchwytu</p>
<p style="doc_normal"></p>
<p style="Normal" props="text-align:left"><image dataid="/usr/src/abiword/commit/images/grabbar_shaded.png_0" props="height:1.08in; width:1.35in"/></p>
@@ -50,14 +50,14 @@
<p style="Normal" props="lang:en-US">Użytkownicy, którzy uruchamiają AbiWorda w środowisku GNOME, znajdą pasek uchwytu umieszczony na skraju lewej części każdego z pasków narzędziowych, który pozwala w prosty sposób zmodyfikować interfejs wedle życzenia. Kliknij na pasek uchwytu i przeciągnij. Pasek narzędziowy będzie przesuwać się wzdłuż toru myszki, może nawet wisieć nad dowolną częścią ekranu.</p>
<p style="Heading 3">Pasek statusu</p>
<p style="doc_normal"></p>
-<p style="Normal" props="text-indent:0.0000in"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar.png_0" props="height:0.24in; width:6.96in"/></p>
+<p style="Normal" props="text-indent:0.0000in"><image dataid="/usr/src/abiword/commit/statusbar.png_0" props="height:0.24in; width:6.96in"/></p>
<p style="doc_normal" props="text-indent:0.5000in; margin-left:0.0000in"></p>
<p style="Normal" props="text-indent:0.5000in">W pasku statusu znajdziesz skrótowy opis statusu dokumentu. W lewej części paska<c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"> AbiWord</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c> wyświetla kolejny numer strony oraz liczbę wszystkich stron. Następnie w środkowej części, która najczęściej jest pusta, wyświetlany jest krótki pomocniczy opis bieżącej opcji menu. W prawej części paska podany jest tryb pracy klawiatury (<c props="font-weight:bold">+INS</c>, czyli tryb wstawiania, albo <c props="font-weight:bold">-ins</c>, czyli tryb zastępowania) oraz nazwa aktualnego szablonu.</p>
<p style="Normal" props="text-indent:0.5000in"></p>
-<p style="Normal" props="text-indent:0.0000in"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar_quickhelp.png_0" props="height:2.48in; width:6.97in"/></p>
+<p style="Normal" props="text-indent:0.0000in"><image dataid="/usr/src/abiword/commit/statusbar_quickhelp.png_0" props="height:2.48in; width:6.97in"/></p>
<p style="Heading 3">Linijka</p>
<p style="doc_normal"></p>
-<p style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\ruler.png_0" props="height:0.34in; width:8.85in"/></p>
+<p style="Normal"><image dataid="/usr/src/abiword/commit/ruler.png_0" props="height:0.34in; width:8.85in"/></p>
<p style="Normal"></p>
<p style="Normal">Używając linijki możesz w łatwy sposób definiować <c props="lang:en-US">na stronie </c><c props="lang:en-US"></c>marginesy oraz tabulatory.</p>
</section>
@@ -65,7 +65,7 @@
<p style="Normal" props="text-align:left"></p>
</section>
<data>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\full_window.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/full_window.png_0" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAApwAAAFhCAIAAAElyt0+AAAACXBIWXMAAAsSAAALEgHS3X78
AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXwURdbvLPC54IeIuMoKArKcUQgi
d2JABIGVKxwGVrmPGMQQzklmJpcCIUBMgpBwJBzBEI4glwR0RTySzISEzAyZJIC6IB6suwLK
@@ -1458,7 +1458,7 @@
Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW
iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg==
</d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\titlebar.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/titlebar.png_0" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAp8AAAAYCAIAAAFEpzGAAAAACXBIWXMAAAsSAAALEgHS3X78
AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9d1RUWbZ38TqYMAdUkAKabCBoS5As
qKAiKIIgWck5JwkigkgWEFSiiIqCtpjaHFqSIlSBobvtoHaY6fj19Dezpue9Wa++fc6+99at
@@ -1824,7 +1824,7 @@
U3NkC/pNXf3TzsJ2jxwsz3aUR7tKcWkNGacs2/619xjliewpfDI4XsC01wCb6ZPN6En3gjNT
F/m4k8smfLv/D9XFSL9vOncQAAAAAElFTkSuQmCC
</d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar_quickhelp.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/statusbar_quickhelp.png_0" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAp0AAADuCAIAAAGDmRu5AAAACXBIWXMAAAsSAAALEgHS3X78
AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCVQUx7oeAi5EcXlZTKKXQUUJmgii
kVUkUURwQdwAgwiIwKCAKLLIooiiILKIgiKCgrsoKhHUuAvMsM4gi8bk5ZpEk6OJeZrz7kty
@@ -2753,7 +2753,7 @@
rHHd5lpt9kxeQWueBlaZZ/Fw+ux83+U9jEtmQ0dDO9V/An0RGn6kluj/H0TjWnMwPK11AAAA
AElFTkSuQmCC
</d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/statusbar.png_0" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAApwAAAAXCAIAAAFexjhWAAAACXBIWXMAAAsSAAALEgHS3X78
AAAACXRFWHRDb21tZW50AACJKo0GAAAQ2ElEQVR4nO1dC1fbuBIOr+7v3W0pPUtS2P61S3Cc
0NiOQ7g/5HZpu6fkzswnjR628yKQkPU5g4+QZVmR5q0ZuTPJhkWRFvmoCXJq0Hz3hSAvgn/L
@@ -2837,7 +2837,7 @@
pHc9YRw/VddzPPJlb69v8xK8bi3Qo7dknmEXttcXuibeNbhLgrjSHv6qx6vuxdUlifPRnA9/
vvh8+bGUMol5AkbjCX+D/v/6OPv+i4Ym1QAAAABJRU5ErkJggg==
</d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars.png_0" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAp8AAABWCAIAAAFx9VqcAAAACXBIWXMAAAsSAAALEgHS3X78
AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9CXxU1bn4HRJwa23rv699z7a2tX1t
ta226nOBWLVqfW3t5trF1rpVpVpbBFlmEpBFUURZFZCloICgoIKAooBCJpN1lsxkwhJIWAOU
@@ -3416,7 +3416,7 @@
bOnGe+2M3XYot2UDS4L5O8omnlXu+gHXqLwXOB02sXB53k22Z9RfqVlmje7/A8GWRyS/OvHV
AAAAAElFTkSuQmCC
</d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\ruler.png_0" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/ruler.png_0" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAA1IAAAAhCAIAAAErHT00AAAACXBIWXMAAAsSAAALEgHS3X78
AAAACXRFWHRDb21tZW50AACJKo0GAAAN60lEQVR4nO1djXLbOA6WNnmmvb1r76l2u0lrqd2H
c+OkzkRy7Tj3KJ26tg8kJIrWD0VLlAjZwHyjcWSGhiASBEkADN69/xejD4Jt8jWO7uL4A3xA
@@ -3486,7 +3486,7 @@
5Nm7YpO32pdkR7qtS7ijYei3Sa21MD/MD/PD/DA/18gPH/dai3qzrxHWK0Y91/kYVcAsR85m
FvqatoL+5yYxmH0MBoPBYFwa2MizxP8Bf0pzQLOvs0QAAAAASUVORK5CYII=
</d>
-<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars_hiding.png_1" mime-type="image/png" base64="yes">
+<d name="/usr/src/abiword/commit/functionbars_hiding.png_1" mime-type="image/png" base64="yes">
iVBORw0KGgoAAAANSUhEUgAAAVQAAACgCAIAAAGrgzPPAAAACXBIWXMAAAsSAAALEgHS3X78
AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nLRcC3CURbb+h8lr8k4IRALOPwmQ18S8
ABHxcVnBSMTwlofZSEiCGALy2EgkExRlQQQf4FvR0t3VXXdXry513dq61i2rbkIICZkZEhK3
abiword-2.6.4-desktop.patch:
--- NEW FILE abiword-2.6.4-desktop.patch ---
diff -u -r abiword-2.6.4.orig/abiword.desktop abiword-2.6.4/abiword.desktop
--- abiword-2.6.4.orig/abiword.desktop 2008-07-13 15:11:02.000000000 +0200
+++ abiword-2.6.4/abiword.desktop 2008-07-13 21:17:13.000000000 +0200
@@ -7,7 +7,7 @@
StartupNotify=true
Encoding=UTF-8
X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;
+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/x-mif;application/x-kword;application/x-mswrite;application/x-applix-word;application/vnd.wordperfect;
Name=AbiWord
GenericName=Word Processor
Comment=Compose, edit, and view documents
Only in abiword-2.6.4: abiword.desktop.orig
abiword-extras-2.6.4-nohash.patch:
--- NEW FILE abiword-extras-2.6.4-nohash.patch ---
diff -u -r abiword-extras-2.6.4.orig/dictionary/Makefile.am abiword-extras-2.6.4/dictionary/Makefile.am
--- abiword-extras-2.6.4.orig/dictionary/Makefile.am 2008-07-13 14:04:48.000000000 +0200
+++ abiword-extras-2.6.4/dictionary/Makefile.am 2008-07-13 21:23:26.000000000 +0200
@@ -4,9 +4,6 @@
dictionary_DATA = \
ca-ES-barbarism.xml \
en-AU-barbarism.xml \
- es-MX-barbarism.xml\
- ispell_dictionary_list.xml
+ es-MX-barbarism.xml
-EXTRA_DIST = $(dictionary_DATA) \
- BigEndian32.american.hash \
- LittleEndian32.american.hash
+EXTRA_DIST = $(dictionary_DATA)
abiword-plugins-2.6.0-boolean.patch:
--- NEW FILE abiword-plugins-2.6.0-boolean.patch ---
diff -u -r abiword-plugins-2.6.0.orig/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h abiword-plugins-2.6.0/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h
--- abiword-plugins-2.6.0.orig/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-03-18 23:18:02.000000000 +0100
+++ abiword-plugins-2.6.0/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-03-25 17:16:04.000000000 +0100
@@ -20,6 +20,9 @@
#ifndef __LinkGrammarWrap_h__
#define __LinkGrammarWrap_h__
+#ifndef TRUE
+#define TRUE 1
+#endif /* TRUE */
extern "C" {
#include <link-grammar/link-includes.h>
}
diff -u -r abiword-plugins-2.6.0.orig/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h abiword-plugins-2.6.0/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h
--- abiword-plugins-2.6.0.orig/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-03-18 23:18:20.000000000 +0100
+++ abiword-plugins-2.6.0/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-03-25 17:16:04.000000000 +0100
@@ -23,6 +23,9 @@
#ifndef _ODI_STYLE_STYLE_H_
#define _ODI_STYLE_STYLE_H_
+#ifndef TRUE
+#define TRUE 1
+#endif /* TRUE */
// Internal includes
#include "ODi_ListenerState.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 5 Nov 2006 19:09:55 -0000 1.16
+++ .cvsignore 13 Jul 2008 20:22:38 -0000 1.17
@@ -1 +1,4 @@
-abiword-2.4.6.tar.bz2
+abiword-2.6.4.tar.gz
+abiword-docs-2.6.4.tar.gz
+abiword-extras-2.6.4.tar.gz
+abiword-plugins-2.6.4.tar.gz
Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-8/abiword.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- abiword.spec 4 Sep 2007 16:17:46 -0000 1.45
+++ abiword.spec 13 Jul 2008 20:22:38 -0000 1.46
@@ -1,23 +1,26 @@
-%define desktop_file_utils_version 0.9
+%define majorversion 2
+%define minorversion 6
+%define microversion 4
Summary: The AbiWord word processor
Name: abiword
-Version: 2.4.6
-Release: 6%{?dist}
+Version: 2.6.4
+Release: 1%{?dist}
Epoch: 1
Group: Applications/Editors
-License: GPL
-Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2
+License: GPLv2+
+Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
+Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-plugins-%{version}.tar.gz
+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
-PreReq: desktop-file-utils >= %{desktop_file_utils_version}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libstdc++, /usr/bin/g++
-BuildRequires: aspell-devel libpng-devel
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: fribidi-devel, enchant-devel
+BuildRequires: libpng-devel
+BuildRequires: desktop-file-utils
+BuildRequires: fribidi-devel, enchant-devel, wv-devel
BuildRequires: libgnomeprintui22-devel
BuildRequires: autoconf, libtool
@@ -29,43 +32,53 @@
BuildRequires: libwpd-devel >= 0.8.0
BuildRequires: librsvg2-devel
BuildRequires: libwmf-devel
-BuildRequires: aiksaurus-gtk-devel >= 1.2.1
+BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel
BuildRequires: link-grammar-devel >= 4.2.2
-BuildRequires: gtkmathview-devel >= 0.7.5
-BuildRequires: goffice-devel >= 0.1.0
+BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison
+BuildRequires: goffice04-devel
# gnome build deps
BuildRequires: libgnomeui-devel
URL: http://www.abisource.com/
-Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.4.4-desktop.patch
-Patch2: abiword-2.4.6-fontmanager.patch
-Patch3: abiword-2.4.6-toc-layout.patch
+Patch0: abiword-2.6.0-windowshelppaths.patch
+Patch2: abiword-2.6.0-boolean.patch
+Patch1: abiword-2.6.4-desktop.patch
+Patch3: abiword-plugins-2.6.0-boolean.patch
+Patch4: abiword-extras-2.6.4-nohash.patch
%description
-AbiWord is a cross-platform Open Source word processor. The goal is to make
-AbiWord full-featured, and remain lean.
+AbiWord is a cross-platform Open Source word processor. It is full-featured,
+while still remaining lean.
%prep
-%setup -q
-%patch0 -p1 -b .windowshelppaths
+# setup abiword
+%setup -q
%patch1 -p1 -b .desktop
-%patch2 -p1 -b .fontmanager
-%patch3 -p1 -b .toc-layout
+%patch2 -p1 -b .boolean
+
+# setup abiword-plugins
+%setup -q -T -b 1 -n abiword-plugins-%{version}
+%patch3 -p1 -b .boolean
+
+# setup abiword extras
+%setup -q -T -b 2 -n abiword-extras-%{version}
+%patch4 -p1 -b .nohash
+
+# setup abiword documentation
+%setup -q -T -b 3 -n abiword-docs-%{version}
+%patch0 -p1 -b .windowshelppaths
+
%build
-cd abi
-autoconf
-%configure --enable-gnome --with-libxml2
-cd ../wv
-%configure --with-libwmf --with-libxml2
-cd ../abi
-make
-cd ../abiword-plugins
-libtoolize --copy --force
-./nextgen.sh
-%configure --disable-abicollab --disable-gda --disable-pdf --with-abiword=../abi
+# build abiword
+cd $RPM_BUILD_DIR/abiword-%{version}
+%configure
+make %{?_smp_mflags}
+
+# build abiword-plugins
+cd $RPM_BUILD_DIR/abiword-plugins-%{version}
+%configure --disable-gda --disable-abicollab --with-abiword=../abiword-%{version}
# Remove libtool predep_objects and postdep_objects wonkiness so that
# building without -nostdlib doesn't include them twice. Because we
# already link with g++, weird stuff happens if you don't let the
@@ -73,29 +86,50 @@
sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo
sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool.foobar
sed 's/-shared -nostdlib/-shared/' < libtool.foobar > libtool
+make %{?_smp_mflags}
+
+# build the extras
+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
make
-# now make the docs
-cd ../abiword-docs
-ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.4 ./make-html.sh
+# build the documentation
+cd $RPM_BUILD_DIR/abiword-docs-%{version}
+ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/wp/main/unix/abiword ./make-html.sh
%install
-cd abi
-%makeinstall
-cd ../abiword-plugins
-%makeinstall DESTDIR=$RPM_BUILD_ROOT
-
-# install the docs
-cd ../abiword-docs
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help
-cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help/
+rm -rf $RPM_BUILD_ROOT
+
+# install abiword
+cd $RPM_BUILD_DIR/abiword-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT
+# Fix script permission
+chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}-%{majorversion}.%{minorversion}/scripts/abw2html.pl
+
+# install abiword-plugins
+cd $RPM_BUILD_DIR/abiword-plugins-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# install the extras
+cd $RPM_BUILD_DIR/abiword-extras-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# install the documentation
+cd $RPM_BUILD_DIR/abiword-docs-%{version}
+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}/AbiSuite-2.4/AbiWord/help/ -type d -exec chmod -c o+rx {} \;
+find $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/ -type d -exec chmod -c o+rx {} \;
+# finish up
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-cp $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.4/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
+cp $RPM_BUILD_DIR/abiword-extras-%{version}/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
-cd ../abi
+cd $RPM_BUILD_DIR/abiword-%{version}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora --add-category X-Fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -108,9 +142,8 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info
install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info
-rm -f $RPM_BUILD_ROOT%{_bindir}/ttf*
# nuke .la files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/AbiWord-2.4/plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -123,17 +156,21 @@
%files
%defattr(-,root,root)
-%doc abi/docs
-%{_bindir}/AbiWord-2.4
+%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}/AbiWord-2.4
-%{_datadir}/AbiSuite-2.4
+%{_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
%changelog
+* Sun Jul 13 2008 Marc Maurer <uwog at abisource.com> 1:2.6.4-1
+- New upstream release
+
* Tue Sep 04 2007 Lubomir Kundrak <lkundrak at redhat.com> - 1:2.4.6-6.fc7
- Fix 248103
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-8/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 5 Nov 2006 19:09:55 -0000 1.16
+++ sources 13 Jul 2008 20:22:38 -0000 1.17
@@ -1 +1,4 @@
-8ed5fb282b9741aca75b9e47500d39a1 abiword-2.4.6.tar.bz2
+16748b2d6e318e0e2a25581005e1943a abiword-2.6.4.tar.gz
+9f8c0cd81d8889cc90550049f40a484a abiword-docs-2.6.4.tar.gz
+d0893e611d37c3ba09b77fa720a3904d abiword-extras-2.6.4.tar.gz
+3bf973c5a1446ef3eaf980724821d6e9 abiword-plugins-2.6.4.tar.gz
--- abiword-2.0.9-windowshelppaths.patch DELETED ---
--- abiword-2.4.4-desktop.patch DELETED ---
--- abiword-2.4.6-fontmanager.patch DELETED ---
--- abiword-2.4.6-toc-layout.patch DELETED ---
- Previous message (by thread): rpms/subcommander/devel subcommander-2.0.0b3-var.patch, 1.1, 1.2 subcommander.spec, 1.13, 1.14
- Next message (by thread): rpms/andika-fonts/devel andika-fonts-fontconfig.conf, NONE, 1.1 andika-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list