From abc76d26fb9dd347f13409f06d9c98fa4af6a25d Mon Sep 17 00:00:00 2001
From: Shawn W Dunn <sfalken@opensuse.org>
Date: Tue, 11 Oct 2016 10:40:00 -0700
Subject: [PATCH] Removed un-needed patch and changed buildflags

Signed-off-by: Shawn W Dunn <sfalken@opensuse.org>
---
 files/0001-disable_win_mac.patch | 159 ---------------------------------------
 package.yml                      |   8 +-
 pspec_x86_64.xml                 |   4 +-
 3 files changed, 5 insertions(+), 166 deletions(-)
 delete mode 100644 files/0001-disable_win_mac.patch

diff --git a/files/0001-disable_win_mac.patch b/files/0001-disable_win_mac.patch
deleted file mode 100644
index 9a3e871..0000000
--- a/files/0001-disable_win_mac.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-Index: b/build.xml
-===================================================================
---- a/build.xml	2016-03-13 19:25:48.000000000 -0700
-+++ b/build.xml	2016-10-01 14:47:59.242515445 -0700
-@@ -137,10 +137,6 @@
- 
-     <target name="-post-jar">
-         <delete file="${dist.dir}/README.TXT"/>
--        <!-- copy the native libraries to the distribution directory -->
--        <copy todir="dist/native">
--            <fileset dir="native"/>
--        </copy>
-         <!-- copy scripts to the distribution directory -->
-         <copy todir="dist/scripts">
-             <fileset dir="scripts"/>
-@@ -252,7 +248,6 @@
-         </copy>
-         <copy todir="dist">
-             <fileset dir="release/linux-specific"/>
--            <fileset dir="release/win32-specific" includes="OmegaT.bat"/>
-         </copy>
-         <copy todir="dist"
-               file="release/readme.txt">
-@@ -331,100 +326,6 @@
-         <bzip2 zipfile="dist2/OmegaT_${distversion}${beta}_Linux_64.tar.bz2" src="dist2/OmegaT_${distversion}_Linux_64.tar"/>
-    </target>
- 
--
--    <!-- Creates a Windows Installer -->
--    <target name="do-win" depends="init,jar,zip" description="Creates a Windows Installer. PRE: Inno Setup (http://www.jrsoftware.org/isinfo.php) with all optional language packs must be installed and available on the path.
--Custom strings from release\win32-specific must be added manually to the language files.">
--        <copy todir="dist" file="release/win32-specific/OmegaT.exe"/>
--        <copy todir="dist" file="release/win32-specific/OmegaT.l4J.ini"/>
--
--        <delete file="dist/OmegaT.iss"/>
--        <filter token="VERSION_NUMBER_SUBST" value="${distversion}${beta}"/>
--        <copy todir="dist" file="release/win32-specific/OmegaT.iss" filtering="on"/>
--
--        <mkdir dir="dist2"/>
--        <exec executable="${iscc.exe}">
--            <arg file="dist/OmegaT.iss"/>
--        </exec>
--    </target>
--
--    <!-- Creates a Windows Installer with JRE-->
--    <target name="do-win-jre" depends="check-jre" if="jre.exists" description="Creates a Windows Installer with JRE. PRE: Inno Setup (http://www.jrsoftware.org/isinfo.php) with all optional language packs must be installed and available on the path, and a JRE must be present in ${assets.dir}\\jre\\
--Custom strings from release\win32-specific must be added manually to the language files.">
--        <copy todir="dist" file="release/win32-specific/OmegaT.exe"/>
--        <copy todir="dist" file="release/win32-specific/OmegaT.l4J.ini"/>
--
--        <delete file="dist/OmegaT-JRE.iss"/>
--        <filter token="VERSION_NUMBER_SUBST" value="${distversion}${beta}"/>
--        <copy todir="dist" file="release/win32-specific/OmegaT-JRE.iss" filtering="on"/>
--        <exec executable="${iscc.exe}">
--            <arg file="dist/OmegaT-JRE.iss"/>
--        </exec>
--    </target>
--
--    <!-- Builds a Mac distribution -->
--    <target name="mac" description="Build Mac distro. PRE: A MacOS JRE must be present in ${assets.dir}/jre-mac-root/ and JavaAppLauncher must be in ${assets.dir}/ (obtain from AppBundler JAR)" depends="jar,release,check-mac-reqs">
--        <!-- Build directories -->
--        <mkdir dir="dist2"/>
--
--        <filter token="VERSION_NUMBER_SUBST" value="${distversion}"/>
--        <copy todir="build/" file="release/mac-specific/OmegaT.app/Contents/Info.plist" filtering="on"/>
--
--        <zip destfile="dist2/OmegaT_${distversion}${beta}_Mac.zip">
--            <zipfileset dir="dist" excludes="OmegaT OmegaT-JRE linux-install.sh omegat.kaptn OmegaT.exe OmegaT.bat OmegaT.iss OmegaT-JRE.iss OmegaT.l4J.ini l10n-project" prefix="OmegaT.app/Contents/Java"/>
--            <zipfileset dir="release/mac-specific/" excludes="OmegaT.app/Contents/Info.plist"/>
--            <zipfileset dir="build/" includes="Info.plist" prefix="OmegaT.app/Contents/"/>
--            <zipfileset dir="${assets.dir}/" includes="JavaAppLauncher" filemode="755" prefix="OmegaT.app/Contents/MacOS/"/>
--            <zipfileset dir="${assets.dir}/jre-mac-root/" excludes="bin/" filemode="755" prefix="OmegaT.app/Contents/PlugIns/jre/"/>
--        </zip>
--    </target>
--
--    <!-- Requires AppBundler to be available to Ant (e.g. in ~/.ant/lib):
--         https://bitbucket.org/infinitekind/appbundler
--         AppBundler requires Java 1.7 -->
--    <target name="gen-mac" description="Generate Mac .app bundle.">
--        <taskdef name="bundleapp"
--                 classname="com.oracle.appbundler.AppBundlerTask"/>
--        <bundleapp
--            outputdirectory="release/mac-specific"
--            name="OmegaT"
--            displayname="OmegaT"
--            identifier="org.omegat.OmegaT"
--            icon="images/OmegaT.icns"
--            version="@VERSION_NUMBER_SUBST@"
--            shortversion="@VERSION_NUMBER_SUBST@"
--            mainclassname="org.omegat.Main">
--            <option value="-Xdock:name=OmegaT"/>
--            <option value="-Xmx1024M"/>
--            <argument value="--config-file=$APP_ROOT/Contents/Resources/Configuration.properties"/>
--            <!--<option value="-Xdebug" />
--            <option value="-Xrunjdwp:transport=dt_socket,address=8998,server=y"/>-->
--            <bundledocument
--                extensions="project"
--                name="OmegaT Project"
--                role="editor"
--                icon="images/OmegaT.icns"/>
--            <bundledocument
--                extensions="*"
--                name="All Files"
--                role="none"/>
--            <plistentry key="JVMRuntime" value="jre"/>
--        </bundleapp>
--    </target>
--
--    <target name="check-win" depends="init">
--        <condition property="os.windows">
--            <and>
--                <os family="windows"/>
--                <available file="${iscc.exe}" filepath="${java.library.path}" />
--            </and>
--        </condition>
--    </target>
--
--    <target name="check-jre" depends="check-win" if="os.windows">
--        <available file="${assets.dir}/jre" type="dir" property="jre.exists" />
--    </target>
--
-     <target name="check-jre-linux">
-         <available file="${assets.dir}/jre-linux" type="dir" property="jre-linux.exists" />
-     </target>
-@@ -433,22 +334,6 @@
-         <available file="${assets.dir}/jre-linux-64" type="dir" property="jre-linux-64.exists" />
-     </target>
- 
--
--    <target name="check-mac-reqs">
--        <available file="${assets.dir}/JavaAppLauncher" type="file" property="mac-java-stub.exists" />
--        <fail message="There is no Java for MacOS in the ${assets.dir}/JavaAppLauncher" unless="mac-java-stub.exists" />
--        <available file="${assets.dir}/jre-mac-root/Contents/Home/bin/java" type="file" property="mac-java-stub.exists1" />
--        <fail message="There is no Java for MacOS in the ${assets.dir}/jre-mac-root/Contents/Home/bin/java" unless="mac-java-stub.exists1" />
--        <available file="${assets.dir}/jre-mac-root/Contents/Home/lib/rt.jar" type="file" property="mac-java-stub.exists2" />
--        <fail message="There is no Java for MacOS in the ${assets.dir}/jre-mac-root/Contents/Home/lib/rt.jar" unless="mac-java-stub.exists2" />
--    </target>
--
--    <target name="win" description="Build Win32 distro if on Windows. PRE: Inno Setup (http://www.jrsoftware.org/isinfo.php) with all optional language packs must be installed and available on the path, and for the JRE-version a JRE must be present in ${assets.dir}\\jre\\ "
--                                        depends="check-win" if="os.windows">
--        <ant target="do-win" />
--        <ant target="do-win-jre" />
--    </target>
--
-     <!-- Creates WebStart package -->
-     <target name="webstart" depends="init,jar">
-         <ant dir="release/WebStart-specific" antfile="build.xml"/>
-@@ -456,9 +341,9 @@
- 
- 
-     <!-- Builds all OmegaT products -->
--    <target name="all" depends="l10n-pack,src,jar,zip,win,linux,linux-64, mac" />
-+    <target name="all" depends="l10n-pack,src,jar,zip,linux,linux-64" />
- 
--    <target name="checksums" description="Compute the checksum for files"><!--depends="l10n-pack,src,jar,zip,win,linux,mac"-->
-+    <target name="checksums" description="Compute the checksum for files"><!--depends="l10n-pack,src,jar,zip,linux"-->
-         <mkdir dir="dist2/checksums"/>
- 
-         <!-- Adjust the fileset according to what is needed to be checksumed -->
diff --git a/package.yml b/package.yml
index db714ae..4eb51fc 100644
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : OmegaT
 version    : 3.6.0_03
-release    : 1
+release    : 2
 source     :
     - http://pilotfiber.dl.sourceforge.net/project/omegat/OmegaT%20-%20Standard/OmegaT%203.6.0%20update%203/OmegaT_3.6.0_03_Source.zip : 85e148fc48227634847592f013c4c92240b18e77ef8b3b3f63887c3b0c229802
 license    : GPL-3.0
@@ -15,11 +15,9 @@ rundeps    :
 patterns   :
     - docs :
         - /usr/share/doc/OmegaT
-setup      : |
-    %patch -p1 < $pkgfiles/0001-disable_win_mac.patch
 build      : |
-    ant
-    # Fix end-of-line encoding 
+    ant linux-64
+    # Fix end-of-line encoding
     sed -i 's/\r//' dist/*.txt
     find dist/docs/ -type f -exec sed -i 's/\r//' {} \;
 install    : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
index e47be5b..a3daafe 100644
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -35,8 +35,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="1">
-            <Date>2016-10-01</Date>
+        <Update release="2">
+            <Date>2016-10-11</Date>
             <Version>3.6.0_03</Version>
             <Comment>Packaging update</Comment>
             <Name>Shawn W Dunn</Name>
-- 
2.10.0