diff --git a/.cvsignore b/.cvsignore index 0b52d07..d23080e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abiword-2.4.5.tar.bz2 +abiword-2.4.6.tar.bz2 diff --git a/abiword-2.4.5-fontconfig.patch b/abiword-2.4.5-fontconfig.patch deleted file mode 100644 index 7e936cb..0000000 --- a/abiword-2.4.5-fontconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r -u abiword-2.4.5.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.4.5/abi/src/af/xap/unix/xap_UnixApp.cpp ---- abiword-2.4.5.orig/abi/src/af/xap/unix/xap_UnixApp.cpp 2006-05-12 22:40:11.000000000 +0200 -+++ abiword-2.4.5/abi/src/af/xap/unix/xap_UnixApp.cpp 2006-10-12 15:12:34.000000000 +0200 -@@ -134,10 +134,6 @@ - DELETEP(m_pUnixToolbarIcons); - - delete m_fontManager; -- --#if FC_MINOR > 2 -- FcFini(); --#endif - } - - bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue) diff --git a/abiword.spec b/abiword.spec index 0808bda..b21142c 100644 --- a/abiword.spec +++ b/abiword.spec @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.4.5 -Release: 4%{?dist} +Version: 2.4.6 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -45,7 +45,6 @@ URL: http://www.abisource.com/ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.4.4-desktop.patch -Patch2: abiword-2.4.5-fontconfig.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -55,7 +54,6 @@ AbiWord full-featured, and remain lean. %setup -q %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop -%patch2 -p1 -b .fontconfig %build cd abi @@ -137,6 +135,9 @@ update-desktop-database %{_datadir}/applications %{_datadir}/icons/*png %changelog +* Sun Nov 05 2006 Marc Maurer - 1:2.4.6-1.fc6 +- Update to 2.4.6 + * Thu Oct 12 2006 Marc Maurer - 1:2.4.5-4.fc6 - Fix bug 207294 diff --git a/sources b/sources index aa0685d..4041499 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e018669a154164d31c768f773a1c95b4 abiword-2.4.5.tar.bz2 +8ed5fb282b9741aca75b9e47500d39a1 abiword-2.4.6.tar.bz2