[OmegaT/f18] adding a buildrequire to break builds when major change in hunspell

Ismael Olea olea at fedoraproject.org
Sun Dec 9 20:59:14 UTC 2012


commit 895213c7328bd1b4f12af16c745b789f0d970c33
Author: Ismael Olea <ismael at olea.org>
Date:   Sun Dec 9 21:40:01 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

 OmegaT.spec |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/OmegaT.spec b/OmegaT.spec
index c8f9f0a..78837cc 100644
--- a/OmegaT.spec
+++ b/OmegaT.spec
@@ -4,7 +4,7 @@ Summary:	Computer Aid Translation tool
 Version:	2.3.0_06
 #%define versionr	2.2.3_04_Beta
 %define versionr	%{version}
-Release:	5%{?dist}
+Release:	6%{?dist}
 #Release:	0.2.04_Beta%{?dist}
 Source0:	http://downloads.sourceforge.net/omegat/%{name}_%{versionr}_Source.zip
 Source2:	OmegaT-lib-mnemonics-build.xml
@@ -19,6 +19,7 @@ BuildRequires:	htmlparser, vldocking >= 2.1.4
 BuildRequires:	jna
 BuildRequires:	ws-jaxme
 BuildRequires:	swing-layout
+BuildRequires:	hunspell <= 1.4.0
 
 Requires:	java, jpackage-utils
 Requires:	vldocking >= 2.1.4
@@ -29,7 +30,6 @@ Requires:	swing-layout
 Requires:	ws-jaxme
 
 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
@@ -68,6 +68,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
@@ -107,7 +111,7 @@ rm -rf lib/swing-worker-1.2.jar
 
 %build
 
-#limpieza:
+# cleaning:
 sed -i '/class-path/I d' manifest-template.mf
 
 pushd lib-mnemonics
@@ -174,10 +178,14 @@ dos2unix -k -f release/*.txt
 
 
 %changelog
+* Thu Dec 9 2012 Ismael Olea <ismael at olea.org> - 2.3.0_06-6
+- 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
+
 * Thu Dec 6 2012 Ismael Olea <ismael at olea.org> - 2.3.0_06-5
 - update hunspell patch to 1.3.*
 
-* Thu Dec 6 2012 Ismael Olea <ismael at olea.org> - 2.3.0_06-5
+* Thu Dec 6 2012 Ismael Olea <ismael at olea.org> - 2.3.0_06-4
 - bump
 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0_06-3


More information about the scm-commits mailing list