From 4a0338105ad9173ef875749916e6005f478ed17c Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 14 Mar 2005 22:39:45 +0000 Subject: [PATCH] auto-import abiword-2.2.5-2 on branch devel from abiword-2.2.5-2.src.rpm --- .cvsignore | 1 + abiword-2.0.9-windowshelppaths.patch | 254 +++++++++++++ abiword-2.2.1-desktop.patch | 28 ++ abiword-2.2.5-gcc4.patch | 41 +++ abiword-2.2.5-wvread.patch | 11 + abiword.mime | 3 + abiword.spec | 523 +++++++++++++++++++++++++++ sources | 1 + 8 files changed, 862 insertions(+) create mode 100644 abiword-2.0.9-windowshelppaths.patch create mode 100644 abiword-2.2.1-desktop.patch create mode 100644 abiword-2.2.5-gcc4.patch create mode 100644 abiword-2.2.5-wvread.patch create mode 100644 abiword.mime create mode 100644 abiword.spec diff --git a/.cvsignore b/.cvsignore index e69de29..8a08278 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +abiword-2.2.5.tar.bz2 diff --git a/abiword-2.0.9-windowshelppaths.patch b/abiword-2.0.9-windowshelppaths.patch new file mode 100644 index 0000000..187b02d --- /dev/null +++ b/abiword-2.0.9-windowshelppaths.patch @@ -0,0 +1,254 @@ +diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/howto/howtoword.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/howto/howtoword.abw +--- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/howto/howtoword.abw 2004-07-28 19:00:11.612412860 +0100 ++++ abiword-2.0.9/abiword-docs/ABW/fr-FR/howto/howtoword.abw 2004-07-28 19:00:49.785296529 +0100 +@@ -23,7 +23,7 @@ +

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.

+

Visualiser un document AbiWord avec Microsoft Word

+

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 Rich Text Format permet de réaliser facilement cette exportation.

+-

++

+

+

Le format Rich Text est couramment utilisé par les produits Microsoft Office et ils n'auront aucune difficulté à importer les documents enregistrés ainsi.

+

Visualiser les documents Word avec AbiWord

+@@ -31,7 +31,7 @@ +

Si vous rencontrez des problèmes, demandez à l'utilisateur de Word d'enregistrer le document au format Rich Text Format (.rtf). Toutes les versions de Microsoft Word peuvent le faire et AbiWord peut ouvrir les fichiers RTF de manière fiable.

+ + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAhwAAAKXCAYAAADJiZNnAAAABmJLR0QA/wD/AP+gvaeTAAAA + CXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH0gUSDDMylHTKNAAAIABJREFUeJzsvV+oJcl5 + 4PlVcwzngh6qG2TUxgtbl9lmu+7QuOvONu6usbBKEuw0eGGEdmE07MO4C4tZ2TMsMy9m9bY9 +diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw +--- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw 2004-07-28 19:00:11.595415583 +0100 ++++ abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw 2004-07-28 19:00:49.786296369 +0100 +@@ -16,7 +16,7 @@ + +
+

Dialogue remplacer

+-

++

+

Rechercher

+

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 en, vous trouverez les deux lettres au milieu du mot dent tout autant que le mot en.

+

Respecter la casse

+@@ -33,7 +33,7 @@ +

Ce bouton ferme le dialogue Remplacer.

+
+ +- ++ + iVBORw0KGgoAAAANSUhEUgAAAdkAAACqCAIAAABu5KKOAAAaMElEQVR4nO2dX4gkx33Hfxfa + UAMXmDEyaPWknYcj2jFHtBMd6BaF6BzlQdgPtslDTn7KiRjspxDpIfjyEklvtgPByoOQYgg+ + P8TS6cGnS/BFa5DZPdAxu7Dy3JhE3CxEeJbo2G7wQf/ABZuHqq6urv4zPT3d23u33w/LUl1d +diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/workspace.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/workspace.abw +--- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/workspace.abw 2004-07-28 19:00:11.604414141 +0100 ++++ abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/workspace.abw 2004-07-28 19:00:49.789295889 +0100 +@@ -23,24 +23,24 @@ +
+

L'espace de travail d'AbiWord

+

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.

+-

++

+

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.

+

Titre de fenêtre

+-

++

+

La fenêtre de titre est similaire à cette de toute autre application, avec une différence toutefois. Notez le caractère * près de Document10. L'astérique signifie que Document10 a été modifié. Ceci fourni un manière simple d'identifier si le document doit être enregistré.

+

Les barres de fonction

+-

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.

++

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.

+

La seconde est la barre d'outils standard et la troisième (au bas) est la barre d'outils de mise en forme.

+

Manipuler les barres

+

AbiWord permet de cacher les barres. Si certaines manquent ou ne sont pas requises vérifiez le menu Affichage > Barres d'outils.

+-

++

+

Barre de saisie

+

+

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.

+

Barre d'état

+

+

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.

+-

++

+

Les règles

+

+

En employant les règles, il devient facile de fixer les marges de la page et les tabulations.

+@@ -49,7 +49,7 @@ +

+
+ +- ++ + iVBORw0KGgoAAAANSUhEUgAAAogAAAGNCAIAAAAdDhfDAAAgAElEQVR4nOy9bWwcx5ku+mjR + vqgJmMWMoSw4gh1oCFnIkLZhkhtBGkbBmjoOYDpZwKIdwGZ8FgnlBDYdX2Qt70EiO4u7trPY + WE5wEmuDxKKDbEQZiCXqIpaYQDozOpB2hoKU4QSSyTFsg0NsBDcRE5rGCeEuXDWg+6O6q6ur +@@ -732,7 +732,7 @@ + Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW + iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg== + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAikAAAEyCAIAAACwCNeMAAAACXBIWXMAAABEAAAARACdvuRJ + AABTv0lEQVR42u29f2wcx5nn/bXQflGzYF4MDSfgGEngIbJGKCbGSrw1LCoJTtRqcWHWC1hO + Foi8uRf2yA4SOTns2flj3yR3eC82Du+beA/5oQTrFWXsxT+AtS0DF1kXREdqYYekYYecQAo1 +@@ -1135,7 +1135,7 @@ + MThhNzQ3OWNiNDVjMWM4ZjU4ODEwMjAxODdiNmZkOGRmYmNlZGIwNjWQ4/dNAAAAAElFTkSu + QmCC + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAnwAAABeCAIAAAA2dF4VAAAACXBIWXMAAABEAAAARACdvuRJ + AABD6UlEQVR42u29fYwc1Zkv/HNUXFVHzlWPBdG0BZG7BRY9DVZmOrGYmQVdZjbRzZi9EraJ + BEPeVRgDAjtIiU1WiSHRrk1WG5tEy8VEITNcZRk7UrDNVRhPInO7/cpst9FAz0SGno4ATVvB +@@ -1496,7 +1496,7 @@ + DARcAEBsLLAFAABFC65ZAT5ljHl7Cpt/HGtWAABrMLOCaDgEBABIgTUriEbi4lkAQPkIK4iC + QzsAgFT+AnafvftOpg+NAAAAAElFTkSuQmCC + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAoYAAAAWCAIAAADSEcpEAAAACXBIWXMAAABEAAAARACdvuRJ + AAAKN0lEQVR42u2dXYjc1hXH/wEFjmACEriwAy10TAlxHEq9bgO2ScBx85AtLsROXtYkD0me + 4rSQ2n0o5CnYD/1wCiHbQogTKN0EanYWmnobanZcajxbutkZ8McqtCYa6IIGvFgXMqADvg99 +@@ -1550,7 +1550,7 @@ + N2NlNzE0YWQwMjdlM2M5MWZiMjk0ZTc2ZDNlNDU2ZmQxMjFjZmE4ODZiNWRlMGUzZTNmZjhm + ZTJhZTY0MmU4HyCiUgAAAABJRU5ErkJggg== + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAm8AAACbCAIAAAC7yOv5AAAACXBIWXMAAABEAAAARACdvuRJ + AAAqpUlEQVR42u2df2hlx5XnT4cbqAcaeDJOkGB3icTSxFII69Zug92TMN2eXkgvXoiT/LEd + ZiBW40DayZCN88eS5J9J+4/9kVmSuGdYY7VhZ+3ABsuwiXuH9LZ6iSMpuEfS0G31M4nRE6yZ +diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/howto/howtoword.abw abiword-2.0.9/abiword-docs/ABW/pl-PL/howto/howtoword.abw +--- abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/howto/howtoword.abw 2004-07-28 19:00:11.584417345 +0100 ++++ abiword-2.0.9/abiword-docs/ABW/pl-PL/howto/howtoword.abw 2004-07-28 19:00:49.791295568 +0100 +@@ -24,7 +24,7 @@ +

Podgląd dokumentów AbiWorda w programie Microsoft Word

+

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.

+

+-

++

+

+

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.

+

Podgląd dokumentów Microsoft Word w AbiWordzie

+@@ -32,7 +32,7 @@ +

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.

+ + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAl0AAAGYCAIAAAGAKvBwAAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXQUxbru6Z59Jvu+IU9Qr7jh8Yrg + Coq4IKiIinAFFFxYghCQhASyEQj7GgKB7CsJgYCAEJLM9ARCUNGrjyvi9TxChCBclsBlMWzp +diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/interface/workspace.abw abiword-2.0.9/abiword-docs/ABW/pl-PL/interface/workspace.abw +--- abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/interface/workspace.abw 2004-07-28 19:00:11.576418627 +0100 ++++ abiword-2.0.9/abiword-docs/ABW/pl-PL/interface/workspace.abw 2004-07-28 19:00:49.962268173 +0100 +@@ -25,24 +25,24 @@ +

Obszar roboczy AbiWorda

+

Obszar roboczy jest podobny do tych, jakie znamy z innych edytorów tekstu. Dlatego każdy nowy użytkownik AbiWorda może się czuć jak u siebie w domu.

+

+-

++

+

+

Znajomy interfejs pozwala większości użytkownikom od razu rozpocząć pracę. Tym niemniej niektóre możliwości będą nowością.

+

+

Okno tytułu

+

+-

++

+

+

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.

+

Paski funkcji

+-

++

+

+

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.

+

Drugi to pasek “Standardowy”, trzeci z wyżej pokazanych (na dole) to pasek "Formatowanie".

+

Paski robocze

+

AbiWord pozwala na ukrywanie pasków narzędzi. Jeśli któregoś brakuje albo nie jest potrzebny, sprawdź w Widok > Paski narzędzi.

+

+-

++

+

Pasek uchwytu

+

+

+@@ -50,14 +50,14 @@ +

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.

+

Pasek statusu

+

+-

++

+

+

W pasku statusu znajdziesz skrótowy opis statusu dokumentu. W lewej części paska AbiWord 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 (+INS, czyli tryb wstawiania, albo -ins, czyli tryb zastępowania) oraz nazwa aktualnego szablonu.

+

+-

++

+

Linijka

+

+-

++

+

+

Używając linijki możesz w łatwy sposób definiować na stronie marginesy oraz tabulatory.

+ +@@ -65,7 +65,7 @@ +

+ + +- ++ + iVBORw0KGgoAAAANSUhEUgAAApwAAAFhCAIAAAElyt0+AAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXwURdbvLPC54IeIuMoKArKcUQgi + d2JABIGVKxwGVrmPGMQQzklmJpcCIUBMgpBwJBzBEI4glwR0RTySzISEzAyZJIC6IB6suwLK +@@ -1458,7 +1458,7 @@ + Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW + iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg== + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAp8AAAAYCAIAAAFEpzGAAAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9d1RUWbZ38TqYMAdUkAKabCBoS5As + qKAiKIIgWck5JwkigkgWEFSiiIqCtpjaHFqSIlSBobvtoHaY6fj19Dezpue9Wa++fc6+99at +@@ -1824,7 +1824,7 @@ + U3NkC/pNXf3TzsJ2jxwsz3aUR7tKcWkNGacs2/619xjliewpfDI4XsC01wCb6ZPN6En3gjNT + F/m4k8smfLv/D9XFSL9vOncQAAAAAElFTkSuQmCC + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAp0AAADuCAIAAAGDmRu5AAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCVQUx7oeAi5EcXlZTKKXQUUJmgii + kVUkUURwQdwAgwiIwKCAKLLIooiiILKIgiKCgrsoKhHUuAvMsM4gi8bk5ZpEk6OJeZrz7kty +@@ -2753,7 +2753,7 @@ + rHHd5lpt9kxeQWueBlaZZ/Fw+ux83+U9jEtmQ0dDO9V/An0RGn6kluj/H0TjWnMwPK11AAAA + AElFTkSuQmCC + +- ++ + iVBORw0KGgoAAAANSUhEUgAAApwAAAAXCAIAAAFexjhWAAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAQ2ElEQVR4nO1dC1fbuBIOr+7v3W0pPUtS2P61S3Cc + 0NiOQ7g/5HZpu6fkzswnjR628yKQkPU5g4+QZVmR5q0ZuTPJhkWRFvmoCXJq0Hz3hSAvgn/L +@@ -2837,7 +2837,7 @@ + pHc9YRw/VddzPPJlb69v8xK8bi3Qo7dknmEXttcXuibeNbhLgrjSHv6qx6vuxdUlifPRnA9/ + vvh8+bGUMol5AkbjCX+D/v/6OPv+i4Ym1QAAAABJRU5ErkJggg== + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAp8AAABWCAIAAAFx9VqcAAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9CXxU1bn4HRJwa23rv699z7a2tX1t + ta226nOBWLVqfW3t5trF1rpVpVpbBFlmEpBFUURZFZCloICgoIKAooBCJpN1lsxkwhJIWAOU +@@ -3416,7 +3416,7 @@ + bOnGe+2M3XYot2UDS4L5O8omnlXu+gHXqLwXOB02sXB53k22Z9RfqVlmje7/A8GWRyS/OvHV + AAAAAElFTkSuQmCC + +- ++ + iVBORw0KGgoAAAANSUhEUgAAA1IAAAAhCAIAAAErHT00AAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAN60lEQVR4nO1djXLbOA6WNnmmvb1r76l2u0lrqd2H + c+OkzkRy7Tj3KJ26tg8kJIrWD0VLlAjZwHyjcWSGhiASBEkADN69/xejD4Jt8jWO7uL4A3xA +@@ -3486,7 +3486,7 @@ + 5Nm7YpO32pdkR7qtS7ijYei3Sa21MD/MD/PD/DA/18gPH/dai3qzrxHWK0Y91/kYVcAsR85m + FvqatoL+5yYxmH0MBoPBYFwa2MizxP8Bf0pzQLOvs0QAAAAASUVORK5CYII= + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAVQAAACgCAIAAAGrgzPPAAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nLRcC3CURbb+h8lr8k4IRALOPwmQ18S8 + ABHxcVnBSMTwlofZSEiCGALy2EgkExRlQQQf4FvR0t3VXXdXry513dq61i2rbkIICZkZEhK3 diff --git a/abiword-2.2.1-desktop.patch b/abiword-2.2.1-desktop.patch new file mode 100644 index 0000000..e9184a3 --- /dev/null +++ b/abiword-2.2.1-desktop.patch @@ -0,0 +1,28 @@ +--- abiword-2.2.1/abi/abiword.desktop.desktop 2004-12-06 08:55:02.366730824 +0000 ++++ abiword-2.2.1/abi/abiword.desktop 2004-12-06 08:57:31.004206527 +0000 +@@ -6,11 +6,17 @@ + Categories=Application;Office;WordProcessor;X-Red-Hat-Base; + StartupNotify=true + Encoding=UTF-8 +-X-Desktop-File-Install-Version=0.4 +-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain; +-Name=AbiWord Word Processor +-Name[de]=AbiWord Textverarbeitung +-Name[nb]=AbiWord Tekstbehandling +-Name[nn]=AbiWord Tekstbehandling +-Name[no]=AbiWord Tekstbehandler +-Name[pt]=AbiWord Processador de Texto ++X-Desktop-File-Install-Version=0.9 ++MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite; ++Name=Word Processor ++Comment=AbiWord Word Processor ++Name[de]=Textverarbeitung ++Comment[de]=AbiWord Textverarbeitung ++Name[nb]=Tekstbehandling ++Comment[nb]=AbiWord Tekstbehandling ++Name[nn]=Tekstbehandling ++Comment[nn]=AbiWord Tekstbehandling ++Name[no]=Tekstbehandler ++Comment[no]=AbiWord Tekstbehandler ++Name[pt]=Processador de Texto ++Comment[pt]=AbiWord Processador de Texto diff --git a/abiword-2.2.5-gcc4.patch b/abiword-2.2.5-gcc4.patch new file mode 100644 index 0000000..360aa24 --- /dev/null +++ b/abiword-2.2.5-gcc4.patch @@ -0,0 +1,41 @@ +diff -ru abiword-2.2.5.orig/wv/wvConfig.c abiword-2.2.5/wv/wvConfig.c +--- abiword-2.2.5.orig/wv/wvConfig.c 2005-03-04 08:48:33.804025324 +0000 ++++ abiword-2.2.5/wv/wvConfig.c 2005-03-04 08:50:44.807202081 +0000 +@@ -2130,7 +2130,7 @@ + } + + static void +-startElement (void *userData, const XML_Char *name, const XML_Char **atts) ++wvstartElement (void *userData, const XML_Char *name, const XML_Char **atts) + { + unsigned int nAtts = 0; + const XML_Char **p; +@@ -3094,7 +3094,7 @@ + } + + static void +-endElement (void *userData, const XML_Char *name) ++wvendElement (void *userData, const XML_Char *name) + { + state_data *mydata = (state_data *) userData; + unsigned int token_type; +@@ -3470,8 +3470,8 @@ + memset(&hdl, 0, sizeof(hdl)); + + hdl.getEntity = _getEntity; +- hdl.startElement = startElement; +- hdl.endElement = endElement; ++ hdl.startElement = wvstartElement; ++ hdl.endElement = wvendElement; + hdl.characters = charData; + + if (myhandle->fp) +@@ -3514,7 +3514,7 @@ + size_t len; + + XML_SetUserData (parser, myhandle); +- XML_SetElementHandler (parser, startElement, endElement); ++ XML_SetElementHandler (parser, wvstartElement, wvendElement); + XML_SetCharacterDataHandler (parser, charData); + + if (myhandle->fp == NULL) diff --git a/abiword-2.2.5-wvread.patch b/abiword-2.2.5-wvread.patch new file mode 100644 index 0000000..bbc555e --- /dev/null +++ b/abiword-2.2.5-wvread.patch @@ -0,0 +1,11 @@ +diff -u abiword-2.2.5.orig/wv/libole2/ms-ole.c abiword-2.2.5/wv/libole2/ms-ole.c +--- abiword-2.2.5.orig/wv/libole2/ms-ole.c 2004-10-23 02:59:51.000000000 +0200 ++++ abiword-2.2.5/wv/libole2/ms-ole.c 2005-03-14 21:50:48.000000000 +0100 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#undef read + + #ifdef __MINGW32__ /* incomplete defines on mingw */ + diff --git a/abiword.mime b/abiword.mime new file mode 100644 index 0000000..011bf4d --- /dev/null +++ b/abiword.mime @@ -0,0 +1,3 @@ +application/x-abiword + ext: abw + diff --git a/abiword.spec b/abiword.spec new file mode 100644 index 0000000..a30feee --- /dev/null +++ b/abiword.spec @@ -0,0 +1,523 @@ +%define desktop_file_utils_version 0.9 + +Summary: The AbiWord word processor +Name: abiword +Version: 2.2.5 +Release: 2 +Epoch: 1 +Group: Applications/Editors +License: GPL +Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2 +Source11: abiword.mime +Requires: libwmf >= 0.2.8.3 +Requires: libxml2 >= 2.6.8 +Requires: aiksaurus-gtk >= 1.2.1 +Requires: libgnomedb >= 1.0.4 +Requires: enchant +PreReq: desktop-file-utils >= %{desktop_file_utils_version} + +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: libstdc++, /usr/bin/g++ +BuildRequires: gtk2-devel aspell-devel libpng-devel +BuildRequires: libxml2-devel +BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} +BuildRequires: fribidi-devel, enchant-devel + +# some plugin build deps +BuildRequires: ots-devel >= 0.4.2 +BuildRequires: libwpd-devel >= 0.8.0 +BuildRequires: librsvg2-devel +BuildRequires: libwmf-devel +BuildRequires: aiksaurus-gtk-devel >= 1.2.1 + +# gnome build deps +BuildRequires: libbonobo-devel +BuildRequires: libbonoboui-devel +BuildRequires: libgnomeprint22-devel +BuildRequires: libgnomeprintui22-devel +BuildRequires: libgnomeui-devel +URL: http://www.abisource.com/ + +Patch0: abiword-2.0.9-windowshelppaths.patch +Patch1: abiword-2.2.1-desktop.patch +Patch2: abiword-2.2.5-gcc4.patch +Patch3: abiword-2.2.5-wvread.patch + +%description +AbiWord is a cross-platform Open Source word processor. The goal is to make +AbiWord full-featured, and remain lean. + +%prep +%setup -q +%patch0 -p1 -b .windowshelppaths +%patch1 -p1 -b .desktop +%patch2 -p1 -b .gcc4 +%patch3 -p1 -b .wvread + +%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-gda --with-abiword=../abi +sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo +sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool +make + +# now make the docs +cd ../abiword-docs +ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.2 ./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.2/AbiWord/help +cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help/ +# some of the help dirs have bad perms (#109261) +find $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help/ -type d -exec chmod -c o+rx {} \; + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +cp $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.2/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png + +cd ../abi +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +desktop-file-install --vendor gnome \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Red-Hat-Extra --remove-category X-Red-Hat-Base \ + --add-category Applications --add-category Office \ + ./abiword.desktop +# remove the original one (which has X-Red-Hat-Base) (#107023) +rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop + +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.2/plugins/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig +update-desktop-database %{_datadir}/applications + +%postun +/sbin/ldconfig +update-desktop-database %{_datadir}/applications + +%files +%defattr(-,root,root) +%doc abi/docs +%{_bindir}/AbiWord-2.2 +%{_bindir}/abiword +%{_libdir}/AbiWord-2.2 +%{_datadir}/AbiSuite-2.2 +%{_datadir}/applications/* +%{_datadir}/mime-info/* +%{_datadir}/pixmaps/*png +%{_datadir}/icons/*png + +%changelog +* Fri Mar 14 2005 Marc Maurer - 1:2.2.5-2 +- Remove the --disable-magick plugin switch +- disable GDA support until the plugin is ported to gnomedb 1.2.x +- Change the download location from SF to http://www.abisource.com/ +- patch libole2 + +* Fri Mar 2 2005 Caolan McNamara - 1:2.2.5-1 +- bump to latest stable +- drop integrated dashboard patch again +- some gcc4 fixes + +* Wed Feb 23 2005 Caolan McNamara - 1:2.2.4-2 +- rh#149447# dashboard spam revisited + +* Tue Feb 22 2005 Caolan McNamara - 1:2.2.4-1 +- bump to latest stable version +- drop integrated nautilus depend patch +- drop integrated libwpd depend patch + +* Fri Feb 11 2005 Caolan McNamara - 1:2.2.3-4 +- upgrade to libwpd-0.8 and incoroprate necessary changeover patches + +* Mon Feb 7 2005 Matthias Clasen - 1:2.2.3-3 +- rebuild + +* Mon Feb 2 2005 Caolan McNamara - 1:2.2.3-2 +- remove unneccessary nautilus dependency + +* Mon Jan 17 2005 Caolan McNamara - 1:2.2.3-1 +- bump to new version +- drop integrated silenceabidash patch + +* Fri Jan 14 2005 Caolan McNamara - 1:2.2.2-4 +- RH#145085# annoying cluepacket message on stdout/stderr + +* Wed Jan 12 2005 Tim Waugh - 1:2.2.2-3 +- Rebuilt for new readline. + +* Tue Jan 11 2005 Caolan McNamara - 1:2.2.2-2 +- RH#143368# use enchant as spellchecker + +* Mon Dec 13 2004 Caolan McNamara - 1:2.2.2-1 +- bump to new version + +* Mon Dec 6 2004 Caolan McNamara - 1:2.2.1-1 +- bump to new version +- geometry patch upstreamed +- security patch upstreamed +- removeoledecod patch upstreamed +- regenerate desktop patch + +* Mon Nov 22 2004 Caolan McNamara - 1:2.2.0-2 +- #abi7961# remove tempnam usages + +* Mon Nov 22 2004 Caolan McNamara - 1:2.2.0-1 +- bump to latest major stable version +- #rh140321# sanity check geometry + +* Tue Nov 9 2004 Caolan McNamara - 1:2.0.14-1 +- bump to latest stable version + +* Mon Nov 8 2004 Jeremy Katz - 1:2.0.12-4 +- rebuild for python 2.4 + +* Thu Sep 30 2004 Christopher Aillon 1:2.0.12-3 +- Change to PreReq instead of Requires(post), up to 0.9 + +* Thu Sep 29 2004 Caolan McNamara 1:2.0.12-2 +- Better Requires desktop-file-utils + +* Wed Sep 29 2004 Caolan McNamara 1:2.0.12-1 +- update to new abiword, + change norwegian wordprocessor translation + +* Tue Sep 14 2004 Caolan McNamara 1:2.0.11-3 +- #132389# Add more abiword supported mime types to abiword.desktop + +* Mon Sep 6 2004 Caolan McNamara 1:2.0.11-2 +- merge abiword.keys into abiword.desktop + +* Fri Aug 27 2004 Caolan McNamara 1:2.0.11-1 +- 2.0.11 + +* Tue Aug 10 2004 Caolan McNamara 1:2.0.10-2 +- use libgnomedb + +* Tue Aug 10 2004 Caolan McNamara 1:2.0.10-1 +- 2.0.10 +- use aiksaurus + +* Tue Aug 2 2004 Matthias Clasen 1:2.0.9-4 +- rebuilt + +* Thu Jul 29 2004 Caolan McNamara 1:2.0.9-3 +- #126012# some desktop translations + +* Wed Jul 28 2004 Caolan McNamara 1:2.0.9-2 +- #128004# fix irritating windows looking filenames for generated pngs + +* Fri Jul 16 2004 Caolan McNamara 1:2.0.9-1 +- 2.0.9, new version with security fix + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Thu May 20 2004 Caolan McNamara 1:2.0.6-1 +- 2.0.7, new version + gcc34 fixes + +* Wed Apr 28 2004 Caolan McNamara 1:2.0.6-1 +- 2.0.6, 64bit changes made upstream + +* Sat Mar 13 2004 Jeremy Katz <> 1:2.0.5-1 +- 2.0.5 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Thu Feb 19 2004 Jeremy Katz - 1:2.0.3-3 +- rebuild for newer libots and libwpd +- fix verify as non-root (#109261) +- add wpd files to abiword.keys (#114907) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 29 2004 Jeremy Katz - 1:2.0.3-1 +- 2.0.3 (fixes build against gtk+ 2.3 and lets us rebuild to fix libcroco dep) + +* Wed Dec 17 2003 Jeremy Katz 1:2.0.2-2 +- rebuild for new libwpd + +* Sun Nov 30 2003 Jeremy Katz +- and librsvg2-devel (#111222) + +* Fri Nov 28 2003 Jeremy Katz +- buildrequire libgnomeui-devel (#111164) + +* Tue Oct 28 2003 Jeremy Katz 1:2.0.1-1 +- 2.0.1 +- really remove duplicate desktop file + +* Tue Oct 21 2003 Jeremy Katz 1:2.0.0-6 +- make the docs with the just built abiword so that we don't have to + have abiword installed to build the docs (#107279) + +* Tue Oct 21 2003 Jeremy Katz 1:2.0.0-5 +- fix linkage to glib 1.2 in hancom plugin (#106033) + +* Sun Oct 19 2003 Florian La Roche +- add %%clean specfile target + +* Tue Oct 14 2003 Jeremy Katz 1:2.0.0-4 +- remove duplicate desktop file (#107023) + +* Tue Sep 23 2003 Jeremy Katz 1:2.0.0-3 +- include the help +- show the clipart (#104577) + +* Mon Sep 15 2003 Jeremy Katz 1:2.0.0-2 +- rebuild with newer libwpd and libots to get those plugins + +* Sun Sep 14 2003 Jeremy Katz 1:2.0.0-1 +- 2.0.0 + +* Thu Sep 4 2003 Jeremy Katz 1:1.99.6-1 +- 1.99.6 + +* Mon Aug 25 2003 Jeremy Katz 1:1.99.5-1 +- 1.99.5 + +* Tue Aug 5 2003 Jeremy Katz 1:1.99.3-1 +- 1.99.3 +- put icon in the right place (#101646) +- fix some 64bit casting issues +- disable ots plugin for now, doesn't seem to build with ots 0.4.0 :/ +- disable -pedantic -ansi so that it will build + +* Mon Jul 14 2003 Jeremy Katz 1:1.99.2-2 +- ugly hack to deal with libtool silliness on x86_64 + +* Fri Jul 11 2003 Jeremy Katz 1:1.99.2-1 +- 1.99.2 +- add buildrequires to make sure the ots and wp plugins get built +- no longer needs libgal2, remove buildrequires + +* Mon Jun 16 2003 Jeremy Katz 1:1.99.1-1 +- 1.99.1 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon May 26 2003 Jeremy Katz 1:1.9.1-3 +- rebuild for new libgal2 + +* Mon May 19 2003 Jeremy Katz 1:1.9.1-2 +- tweak plugins build + +* Mon May 12 2003 Jeremy Katz 1:1.9.1-0.2 +- 1.9.1 +- drop old patches, switch to using autoconf based build system instead + of diving makefiles +- build with gnome support +- build with plugins +- add patch to build on AMD64 + +* Mon Apr 28 2003 Tim Powers 1:1.0.5-2 +- rebuild to fix broken libpspell dep + +* Mon Mar 24 2003 Jeremy Katz 1:1.0.5-1 +- 1.0.5 + +* Mon Feb 10 2003 Jeremy Katz 1:1.0.4-2 +- fix for abiword starting off the screen (#82425) + +* Thu Jan 23 2003 Jeremy Katz 1:1.0.4-1 +- 1.0.4 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Sun Dec 29 2002 Jeremy Katz 1:1.0.3-2 +- make it build on x86_64 + +* Sun Dec 29 2002 Jeremy Katz 1:1.0.3-1 +- 1.0.3 (#80560) +- set umask before running mkfontdir in %%post +- patch AbiWord script to convert utf8 locales into non-utf8 variants (#72633) + +* Mon Dec 02 2002 Elliot Lee 1.0.2-7 +- Fix doc lines +- Fix multilib + +* Sat Aug 10 2002 Elliot Lee 1.0.2-6 +- rebuilt with gcc-3.2 (we hope) + +* Sat Aug 10 2002 Jeremy Katz 1.0.2-5 +- fix help index symlink (#71219) + +* Thu Aug 1 2002 Jeremy Katz 1.0.2-4 +- add abiword binary symlink for upstream compatibility (#70267) + +* Mon Jul 22 2002 Tim Powers 1.0.2-3 +- rebuild using gcc-3.2-0.1 + +* Thu Jul 18 2002 Jeremy Katz 1.0.2-2 +- use included desktop file (#64447) +- use desktop-file-install + +* Wed Jun 26 2002 Jeremy Katz 1.0.2-1 +- 1.0.2 +- disable perl module build since we weren't including it anyway + +* Wed May 29 2002 Bernhard Rosenkraenzer 1.0.1-1 +- 1.0.1 + +* Sun Apr 14 2002 Jeremy Katz 0.99.5-1 +- zh_CN and zh_TW fonts.dir were flipped +- update to 0.99.5 as it fixes some major bugs +- define ABI_BUILD_VERSION so the about screen gives us a version + +* Mon Apr 8 2002 Bennhard Rosenkraenzer 0.99.4-2 +- 1st try at fixing up CJK (#61590) +- #if 0'ify font warning dialog (#62909, #64556) + +* Tue Apr 2 2002 Bernhard Rosenkraenzer 0.99.4-1 +- Update to 0.99.4, fixes #61153 +- Fix #61344 +- Nuke the warning about being unable to add anything to font path, + that's not how xfs works. + +* Thu Feb 28 2002 Bernhard Rosenkraenzer 0.99.2-1 +- 0.99.2 +- remove blank lines in fonts.dir + +* Thu Jan 31 2002 Bernhard Rosenkraenzer 0.99.1-1 +- 0.99.1 + +* Wed Jan 30 2002 Alex Larsson 0.9.5-3 +- Added patch to use libpng10 +- Added patch to fix perl build problems. + +* Fri Nov 23 2001 Bernhard Rosenkraenzer 0.9.5-1 +- 0.9.5 + +* Tue Oct 23 2001 Bernhard Rosenkraenzer 0.9.4.1-1 +- Update to 0.9.4.1 (RFE #54806) +- Add URL (RFE #54590) + +* Thu Jul 19 2001 Bernhard Rosenkraenzer 0.7.14-7 +- Fix uninstall (#49350) + +* Sat Jul 7 2001 Tim Powers +- rebuilt so that dirs aren't sgid root + +* Tue Jun 26 2001 Bernhard Rosenkraenzer 0.7.14-5 +- Add build requirements (#45157) + +* Tue Jun 26 2001 Bernhard Rosenkraenzer 0.7.14-4 +- Remove CVS admin files from documentation (#44916) + +* Mon Jun 18 2001 Florian La Roche +- add s390x patch from + +* Sat Jun 09 2001 Florian La Roche +- add s390 patch from Helge Deller + +* Tue May 22 2001 Bernhard Rosenkraenzer 0.7.14-1 +- Update to 0.7.14 + +* Tue Feb 27 2001 Bernhard Rosenkraenzer +- Handle MIME type stuff (Bug #27530) +- Add BuildPrereqs for some of the less common stuff AbiWord uses + (gal-devel, gnome-print-devel, libunicode-devel) + +* Tue Feb 20 2001 Bernhard Rosenkraenzer +- 0.7.13 + +* Mon Jan 15 2001 Than Ngo +- fixed broken code for building + +* Fri Dec 29 2000 Matt Wilson +- 0.7.12 +- copy fonts.dir to fonts.scale so mkfontdir doesn't blow it away + +* Tue Dec 12 2000 Bernhard Rosenkraenzer +- Rebuild to get rid of 0777 dirs + +* Fri Nov 17 2000 Bernhard Rosenkraenzer +- 0.7.11 + +* Sun Aug 20 2000 Preston Brown +- fix path to chkfontpath, it was wrong. + +* Fri Aug 11 2000 Jonathan Blandford +- Up Epoch and release + +* Mon Aug 7 2000 Jakub Jelinek +- Don't ship AbiWord_s if we have AbiWord_d +- Register AbiWord's fontpath with xfs + +* Wed Aug 2 2000 Bernhard Rosenkraenzer +- Rebuild with new libpng. This fixes Bug #13707 - gotta love it when they + change the ABI without increasing the soname! +- fix tooltip (Bug #14711) +- move binaries from /usr/share to /usr/lib + +* Wed Jul 12 2000 Jakub Jelinek +- Fix build on ia64. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 4 2000 Jakub Jelinek +- Rebuild with new gcc. + +* Sat Jun 18 2000 Bernhard Rosenkraenzer +- Fix build on ia64 + +* Fri Jun 17 2000 Bernhard Rosenkraenzer +- 0.7.10 +- update download location + +* Fri Jun 9 2000 Bernhard Rosenkraenzer +- initial build for main CD +- clean up specfile +- fix build with gcc 2.96 and glibc 2.2 +- exclude ia64 for now + +* Wed May 3 2000 Bernhard Rosenkraenzer +- 0.7.9 + +* Wed Feb 2 2000 Bernhard Rosenkraenzer +- 0.7.8 +- move the desktop file to /etc/X11/applnk so it can be used in both + GNOME and KDE +- fix up handling of RPM_OPT_FLAGS + +* Thu Jan 20 2000 Tim Powers +- bzipped source to conserve space. + +* Sun Jan 9 2000 Matt Wilson +- enable GNOME, remove perl hack to do RPM_OPT_FLAGS +- added libpng requirement. 0.7.7 requires 1.0.5 libpng ABI + +* Tue Jan 4 2000 Bernhard Rosenkraenzer +- 0.7.7 +- handle RPM_OPT_FLAGS + +* Mon Nov 15 1999 Tim Powers +- first build for inclusion into Powertools. +- some things in this spec file are from the abisuite-0.7.5-1mdk package diff --git a/sources b/sources index e69de29..0ca2894 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +265a6ece8fcfd37cb7c3fc4d13056ad2 abiword-2.2.5.tar.bz2