From 65f64cad838bd8fa24b50efea6a77392bb6e7a19 Mon Sep 17 00:00:00 2001
From: Andy Li <andy@onthewings.net>
Date: Feb 02 2017 08:49:33 +0000
Subject: haxe 3.4.0


---

diff --git a/.gitignore b/.gitignore
index 0126bca..db53a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 /haxe-3.2.1.tar.gz
 /haxelib-4fefbd17a2d9a98200b621de801018af3896d68a.tar.gz
 /ocamllibs-7a83e902634e1db204f6e3a48c2439f63d83c141.tar.gz
+/haxe-3.4.0.tar.gz
+/ocamllibs-5f7956d8a2f0a0d9b99339b793fb9a0a07288a20.tar.gz
+/haxelib-9d79a55ddb054d79ed8d136f1c0583baa407fd67.tar.gz
diff --git a/haxe.spec b/haxe.spec
index 3e5850d..6bdbd31 100644
--- a/haxe.spec
+++ b/haxe.spec
@@ -1,27 +1,24 @@
-%global commit_ocamllibs 7a83e902634e1db204f6e3a48c2439f63d83c141
-%global commit_haxelib 4fefbd17a2d9a98200b621de801018af3896d68a
+%global commit_ocamllibs 5f7956d8a2f0a0d9b99339b793fb9a0a07288a20
+%global commit_haxelib 9d79a55ddb054d79ed8d136f1c0583baa407fd67
 
 Name:           haxe
-Version:        3.2.1
-Release:        4%{?dist}
+Version:        3.4.0
+Release:        1%{?dist}
 Summary:        Multi-target universal programming language
 
 # As described in http://haxe.org/foundation/open-source.html:
 #   * The Haxe Compiler - GPLv2+
 #   * The Haxe Standard Library - MIT
-#   * The Neko Runtime Library - LGPLv2+
 #
 # The source files:
-#   * All files in the std folder is MIT licensed, except:
-#     * std/cs/_std/haxe/ds/IntMap.hx - BSD (2 clause)
-#     * std/haxe/xml/Printer.hx - BSD (3 clause)
+#   * All files in the std folder is MIT licensed.
 #   * Ocamllibs in the libs folder:
-#     * the zlib headers in libs/extc/zlib - zlib
 #     * extc, ilib, javalib, neko, swflib - GPLv2+
+#     * pcre - LGPLv2+
 #     * everything else - LGPLv2.1+
-License:        GPLv2+ and MIT and LGPLv2+ and BSD
+License:        GPLv2+ and MIT and LGPLv2+
 
-URL:            http://www.haxe.org/
+URL:            https://haxe.org/
 
 Source0:        https://github.com/HaxeFoundation/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        https://github.com/HaxeFoundation/ocamllibs/archive/%{commit_ocamllibs}.tar.gz#/ocamllibs-%{commit_ocamllibs}.tar.gz
@@ -31,6 +28,7 @@ BuildRequires:  nekovm >= 2.0.0
 BuildRequires:  ocaml
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  zlib-devel
+BuildRequires:  pcre-devel
 BuildRequires:  help2man
 Requires:       nekovm >= 2.0.0
 Requires:       %{name}-stdlib = %{version}
@@ -54,11 +52,6 @@ by the Haxe compiler.
 pushd libs && tar -xf %{SOURCE1} --strip-components=1 && popd
 pushd extra/haxelib_src && tar -xf %{SOURCE2} --strip-components=1 && popd
 
-# script-without-shebang
-# https://github.com/HaxeFoundation/haxe/commit/7ecbc2baaef0e2f653f43b01071ffff0050ec5d3
-chmod a-x std/js/Boot.hx std/js/_std/Type.hx std/php/_std/haxe/ds/StringMap.hx
-chmod a-x libs/extlib/extList.ml
-
 %build
 # note that the Makefile does not support parallel building
 
@@ -86,7 +79,7 @@ help2man ./haxelib --help-option=help --version-option=version --no-info --outpu
 
 %check
 %{buildroot}%{_bindir}/haxe -version
-pushd tests/unit && %{buildroot}%{_bindir}/haxe compile-macro.hxml && popd
+%{buildroot}%{_bindir}/haxelib version
 
 %files
 %doc README.md
@@ -102,6 +95,10 @@ pushd tests/unit && %{buildroot}%{_bindir}/haxe compile-macro.hxml && popd
 %{_datadir}/%{name}/
 
 %changelog
+* Thu Feb 02 2017 Andy Li <andy@onthewings.net> - 3.4.0-1
+- New upstream version 3.4.0.
+- Fixed license info.
+
 * Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 3.2.1-4
 - Rebuild for OCaml 4.04.0.
 
diff --git a/sources b/sources
index 5d59384..04adb2d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-c2ce3c8dfc4d524ad0f81440adbfe367  haxe-3.2.1.tar.gz
-1bc0356c40aa9fe21d4f961287e5ab93  haxelib-4fefbd17a2d9a98200b621de801018af3896d68a.tar.gz
-d91e0838f641ff2d14d7d151d4e1a179  ocamllibs-7a83e902634e1db204f6e3a48c2439f63d83c141.tar.gz
+SHA512 (haxe-3.4.0.tar.gz) = e55676ea869a67b9ef444cf2b80d0a19f178b845803946cf724fb14cd80c2c1507b5f72c31e50770d7ee6eb37b99424ec9258b7dd8dced898190b8905c703b69
+SHA512 (ocamllibs-5f7956d8a2f0a0d9b99339b793fb9a0a07288a20.tar.gz) = 19fbefd3da07ba13f96c67543b81fe75f63ef0728ed144cd4679851fec25727f1e027cd4b8faea576fec5196c0b596c31bb4c02bfa2b02cc9288ea8673b69a81
+SHA512 (haxelib-9d79a55ddb054d79ed8d136f1c0583baa407fd67.tar.gz) = f142eab565d4c220f8731fe57871b947e0375631d2ef3fefee3a3803e6de5147cde3eda14414142a75885c3fbd5feb28080d7f6dd3827971f7ba08f05725e84d