[OmegaT] - adding a buildrequire to break builds when major change in hunspell - tuning the external hunspell

Ismael Olea olea at fedoraproject.org
Mon Dec 10 18:48:58 UTC 2012


commit a884d67c6224b651cbd97aab3e55cd4d96fcd501
Author: Ismael Olea <ismael at olea.org>
Date:   Mon Dec 10 19:23:07 2012 +0100

    - adding a buildrequire to break builds when major change in hunspell
    - tuning the external hunspell dependency on x86_64 and removed the noarch feature due to this
    - thus, fixing #884212

 OmegaT.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/OmegaT.spec b/OmegaT.spec
index 9e5b201..e9fb886 100644
--- a/OmegaT.spec
+++ b/OmegaT.spec
@@ -26,6 +26,7 @@ BuildRequires:	htmlparser, vldocking >= 2.1.4
 BuildRequires:	jna
 BuildRequires:	ws-jaxme
 BuildRequires:	swing-layout
+BuildRequires:  hunspell <= 1.4.0
 
 BuildRequires:	svnkit >= 1.7.5
 BuildRequires:	jsch
@@ -48,7 +49,6 @@ Requires:	jgit
 Requires:	antlr3-java
 
 License:	GPLv2+
-BuildArch:	noarch
 # http://svn.debian.org/wsvn/pkg-java/trunk04-get-rid-of-MRJAdapter.patch
 Patch1:		OmegaT-04-get-rid-of-MRJAdapter.patch
 Patch2:		OmegaT-help-path.patch
@@ -88,6 +88,10 @@ OmegaT has the following features:
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%ifarch x86_64  # get rids the hardlink to hunspell 
+sed -i -e "s|/usr/lib/libhunspell|/usr/lib64/libhunspell|g" src/org/omegat/util/OConsts.java
+%endif
+
 %patch5 -p1
 
 # not needed outside Netbeans
@@ -140,7 +144,7 @@ rm -rf lib/swing-worker-1.2.jar
 
 %build
 
-#limpieza:
+# cleaning:
 sed -i '/class-path/I d' manifest-template.mf
 
 pushd lib-mnemonics
@@ -218,6 +222,9 @@ dos2unix -k -f release/*.txt
 
 * Mon Dec 10 2012 Ismael Olea <ismael at olea.org> - 2.6.1-0.6.Beta
 - update hunspell patch to 1.3.*
+- adding a buildrequire to break builds when major change in hunspell
+- tuning the external hunspell dependency on x86_64 and removed the noarch feature due to this
+- thus, fixing #884212
 
 * Fri Oct 5 2012 Ismael Olea <ismael at olea.org> - 2.6.1-0.5.Beta
 - update to 2.6.1_01_Beta


More information about the scm-commits mailing list