From b8aba2d665741e193860116901c4c653f598cb4f Mon Sep 17 00:00:00 2001
From: Ismael Olea <ismael@olea.org>
Date: Aug 21 2014 19:30:22 +0000
Subject: Merge branch '2.6.3-tmp'


Conflicts:
	OmegaT.spec

---

diff --git a/OmegaT-build.xml b/OmegaT-build.xml
index a10279f..534ab3c 100644
--- a/OmegaT-build.xml
+++ b/OmegaT-build.xml
@@ -56,6 +56,8 @@ by Ismael Olea <ismael@olea.org>, public domain
           <pathelement location="/usr/share/java/sqljet.jar"/>
           <pathelement location="/usr/share/java/antlr3-runtime.jar"/>
           <pathelement location="/usr/share/java/jgit/jgit.jar"/>
+          <pathelement location="/usr/share/java/jsap/jsap.jar"/>          
+          <pathelement location="/usr/share/java/gnudiff/gnudiff.jar"/>
 <!--          <pathelement location="lib/sjsxp-1.0.2.jar"/> -->
 
         </classpath>
diff --git a/OmegaT.spec b/OmegaT.spec
index f296656..893a589 100644
--- a/OmegaT.spec
+++ b/OmegaT.spec
@@ -13,17 +13,18 @@
 Name:           OmegaT
 %global namer   omegat
 Summary:        Computer Aid Translation tool
-Version:        2.6.1
-%global versionr 2.6.1_01_Beta
-#Release:       1%{?dist}
-Release:        0.14.Beta%{?dist}
+Version:        2.6.3
+#%global versionr 2.6.1_01_Beta
+%global versionr 2.6.3_11
+Release:       2%{?dist}
+#Release:        0.12.Beta%{?dist}
 Source0:        http://downloads.sourceforge.net/omegat/%{name}_%{versionr}_Source.zip
 Source2:        OmegaT-lib-mnemonics-build.xml
 Source3:        OmegaT-build.xml
 Url:            http://www.omegat.org/
 Group:          Applications/Text
 
-BuildRequires:  ant, java-devel >= 1.6.0, jpackage-utils
+BuildRequires:  ant, java-devel >= 1.6.0, javapackages-tools
 BuildRequires:  desktop-file-utils, dos2unix
 BuildRequires:  htmlparser, vldocking >= 2.1.4
 BuildRequires:  jna
@@ -34,11 +35,13 @@ BuildRequires:  hunspell <= 1.4.0
 BuildRequires:  svnkit >= 1.7.5
 BuildRequires:  jsch
 BuildRequires:  sqljet >= 1.1.4
-# OmegaT brings org.eclipse.jgit-1.2.0.201112221803-r.jar but Fedora is 1.1.0
 BuildRequires:  jgit
 BuildRequires:  antlr3-tool
 
-Requires:       java, jpackage-utils
+BuildRequires:	jsap
+BuildRequires:	gnudiff
+
+Requires:       java, javapackages-tools
 Requires:       vldocking >= 2.1.4
 Requires:       htmlparser
 Requires:       hunspell <= 1.4.0
@@ -51,6 +54,9 @@ Requires:       sqljet
 Requires:       jgit
 Requires:       antlr3-java
 
+Requires:       jsap
+Requires:       gnudiff
+
 License:        GPLv2+
 # http://svn.debian.org/wsvn/pkg-java/trunk04-get-rid-of-MRJAdapter.patch
 Patch1:         OmegaT-04-get-rid-of-MRJAdapter.patch
@@ -62,6 +68,9 @@ Patch4:         OmegaT-06-use-system-hunspell.patch
 # reported at http://sourceforge.net/mailarchive/forum.php?thread_name=CAARR2rZ2uT1KOrLLVF9wdS6Ybq_sU_o1u08U54BLzxqxZoyRUQ%40mail.gmail.com&forum_name=omegat-development
 Patch5:         OmegaT-07-use-openjdk-swingworker.patch
 
+# OpenJDK doesn't like some non ascii characters 
+Patch8:		OmegaT-08-unmappable-character-errors.patch
+
 %description
 OmegaT is a free translation memory application written in Java.
 It is a tool intended for professional translators. It does not
@@ -96,15 +105,19 @@ sed -i -e "s|/usr/lib/libhunspell|/usr/lib64/libhunspell|g" src/org/omegat/util/
 %endif
 
 %patch5 -p1
+%patch8 -p1
 
 # not needed outside Netbeans
 rm nbproject/org-netbeans-modules-java-j2seproject-copylibstask.jar
 
 # clean dependencies:
+rm lib/JSAP-2.1.jar
+rm lib/diff.jar
+
 rm lib/svnkit-1.7.5.jar
-rm lib/jsch-0.1.46.jar
+rm lib/jsch-0.1.49.jar
 rm lib/sqljet-1.1.3.jar
-rm lib/org.eclipse.jgit-1.2.0.201112221803-r.jar
+rm lib/org.eclipse.jgit-2.1.0.201209190230-r.jar
 rm lib/antlr-runtime-3.4.jar
 
 # is not really used??
@@ -145,8 +158,10 @@ rm -rf gen/lib/jaxb-xjc.jar
 # using the internal openjdk one:
 rm -rf lib/swing-worker-1.2.jar
 
-%build
+find lib/ -name *.jar
+
 
+%build
 # cleaning:
 sed -i '/class-path/I d' manifest-template.mf
 
@@ -177,7 +192,7 @@ cp -pR release/index.html docs/ images/ %{buildroot}%{_datadir}/%{namer}/
 org.omegat.Main         \
 ""                      \
 ""                      \
-OmegaT:svnkit:jsch:sqljet:antlr3-runtime:jgit/jgit:htmlparser:vldocking:jna:lib-mnemonics:jaxme/jaxme2:jaxme/jaxme2-rt:jaxme/jaxmejs:jaxme/jaxmepm:jaxme/jaxmexs:swing-layout \
+OmegaT:svnkit:jsch:sqljet:antlr3-runtime:jgit/jgit:htmlparser:vldocking:jna:OmegaT-lib-mnemonics:jaxme/jaxme2:jaxme/jaxme2-rt:jaxme/jaxmejs:jaxme/jaxmepm:jaxme/jaxmexs:swing-layout:gnudiff/gnudiff:jsap/jsap \
 %{namer}                \
 true                    \
 }
@@ -217,6 +232,13 @@ dos2unix -k -f release/*.txt
 
 
 %changelog
+* Fri Aug 15 2014 Ismael Olea <ismael@olea.org> - 2.6.3-2
+- added to jpackage_script missing deps to jsap and java-gnudiff
+
+* Thu Aug 7 2014 Ismael Olea <ismael@olea.org> - 2.6.3-1
+- Update to 2.6.3
+- Added OmegaT-08-unmappable-character-errors.patch since OpenJDK seems not to like some non ASCII characters
+  This patch doesn't affect any real code but it's needed to compile.
 
 * Sun Aug 17 2014 Ismael Olea <ismael@olea.org> - 2.6.1-0.14.Beta
 - fixing #1105917