Hello community,
here is the log from the commit of package haxe for openSUSE:Factory checked in
at 2016-01-12 16:12:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/haxe (Old)
and /work/SRC/openSUSE:Factory/.haxe.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haxe"
Changes:
--------
--- /work/SRC/openSUSE:Factory/haxe/haxe.changes 2015-12-14
10:13:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.haxe.new/haxe.changes 2016-01-12
16:12:37.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Nov 23 16:04:43 UTC 2015 - a...@onthewings.net
+
+- Updated to 3.2.1.
+- Moved the haxe standard library files to _datadir.
+- Generate man pages using help2man.
+- Spec file clean-up.
+ * Clarified license.
+ * Manually cp files instead of using "make install".
+ * Added BuildRoot as suggested in openSUSE specfile guidelines.
+
+-------------------------------------------------------------------
Old:
----
haxe-3.2.0.tar.gz
haxelib.tar.xz
ocamllibs.tar.xz
New:
----
haxe-3.2.1.tar.gz
haxelib-4fefbd17a2d9a98200b621de801018af3896d68a.tar.gz
ocamllibs-7a83e902634e1db204f6e3a48c2439f63d83c141.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ haxe.spec ++++++
--- /var/tmp/diff_new_pack.9bwKbC/_old 2016-01-12 16:12:39.000000000 +0100
+++ /var/tmp/diff_new_pack.9bwKbC/_new 2016-01-12 16:12:39.000000000 +0100
@@ -16,81 +16,78 @@
#
-%define haxelib %{_libdir}/%{name}
+%global commit_ocamllibs 7a83e902634e1db204f6e3a48c2439f63d83c141
+%global commit_haxelib 4fefbd17a2d9a98200b621de801018af3896d68a
Name: haxe
-Version: 3.2.0
+Version: 3.2.1
Release: 0
Summary: Multiplatform opensource programming language
-License: GPL-2.0+
+License: GPL-2.0+ and MIT
Group: Development/Languages/Other
+# As described in http://haxe.org/foundation/open-source.html:
+# * The Haxe Compiler - GPLv2+
+# * The Haxe Standard Library - MIT
Url: http://www.haxe.org
-# from https://github.com/HaxeFoundation/haxe/archive/{version}.tar.gz
-Source0: %{name}-%{version}.tar.gz
-# Tarball to download provides empty directories, so builds fail.
-# See more at https://github.com/HaxeFoundation/haxe/issues/4200
-# git clone g...@github.com:HaxeFoundation/ocamllibs.git && cd ocamllibs
-# git archive --format=tar master | xz -z9e > ocamllibs.tar.xz
-Source1: ocamllibs.tar.xz
-# git clone g...@github.com:HaxeFoundation/haxelib.git && cd haxelib
-# git archive --format=tar master | xz -z9e > haxelib.tar.xz
-Source2: haxelib.tar.xz
-BuildRequires: fdupes
-BuildRequires: nekovm
+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
+Source2:
https://github.com/HaxeFoundation/haxelib/archive/%{commit_haxelib}.tar.gz#/haxelib-%{commit_haxelib}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: help2man
+BuildRequires: nekovm >= 2.0.0
BuildRequires: ocaml-camlp4-devel
BuildRequires: pkgconfig(zlib)
-Requires: nekovm
+Requires: nekovm >= 2.0.0
%description
-Haxe is an open-source high-level multiplatform programming language and
compiler that can produce applications and source code for many different
platforms from a single code-base. Code written in the Haxe language can be
compiled into Adobe Flash applications, JavaScript programs, C++ standalone
applications (to some extent), PHP, Apache CGI, and NodeJS server-side
applications.
+Haxe is an open-source high-level multiplatform programming language and
compiler that can produce applications and source code for many different
platforms from a single code-base. The Haxe compiler can compile Haxe source
code to Adobe Flash SWF files, ActionScript 3, JavaScript, C++, PHP, C#, Java,
Python, and Neko VM binary files.
%prep
%setup -q
-cd libs && tar -xf %{SOURCE1} && cd ..
-cd extra/haxelib_src && tar -xf %{SOURCE2} && cd ../..
-# WARNING: script-without-shebang.
-chmod -x std/js/_std/Type.hx
-chmod -x std/js/Boot.hx
-chmod -x std/php/_std/haxe/ds/StringMap.hx
-# WARNING: non-executable-script.
-chmod +x extra/haxelib_src/src/tools/legacyhaxelib/haxelib.sh
+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
-make V=1 %{?_smp_mflags} clean
-make V=1 %{?_smp_mflags} libs
-make V=1 %{?_smp_mflags}
-make V=1 %{?_smp_mflags} tools
+# note that the Makefile does not support parallel building
+
+# Check to see if ocamlopt exists. If not, bytecompile everything.
+# It is because ocamlopt may be missing in some architectures.
+command -v ocamlopt && make || make BYTECODE=1
+
+# Compile haxelib
+make tools
+
+chmod 755 haxe haxelib
%install
-# `make install` is broken for packaging by design, so:
-mkdir -p %{buildroot}/%{haxelib}
-mkdir -p %{buildroot}/%{_bindir}
-
-cp -rf std %{buildroot}/%{haxelib}/std
-cp -rf extra %{buildroot}/%{haxelib}
-mkdir -p %{buildroot}/%{haxelib}/lib
-cp haxe %{buildroot}/%{haxelib}
-
-ln -s ../../%{haxelib}/haxe %{buildroot}/%{_bindir}/haxe
-echo "#!/bin/sh" > %{buildroot}/%{_bindir}/haxelib
-echo "export HAXE_STD_PATH=%{haxelib}/std" >> %{buildroot}/%{_bindir}/haxelib
-echo "exec haxe -cp %{haxelib}/extra/haxelib_src/src --run tools.haxelib.Main
\$*" >> %{buildroot}/%{_bindir}/haxelib
-chmod +x %{buildroot}/%{_bindir}/haxelib
-
-# Windows only file cause "E: devel-file-in-non-devel-package"
-# & "W: incorrect-fsf-address".
-rm %{buildroot}/%{haxelib}/extra/setup.cpp
-# Git, travis, htaccess and other trash.
-find %{buildroot} -name '.*' -type f -delete -print
-%fdupes -s %{buildroot}/%{haxelib}/extra/haxelib_src
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_datadir}/%{name}
+
+cp -p haxe %{buildroot}%{_bindir}
+cp -p haxelib %{buildroot}%{_bindir}
+cp -rfp std %{buildroot}%{_datadir}/%{name}
+
+# Generate man pages
+mkdir -p %{buildroot}%{_mandir}/man1
+help2man ./haxe --version-option=-version --no-discard-stderr --no-info
--output=%{buildroot}%{_mandir}/man1/haxe.1
+help2man ./haxelib --help-option=help --version-option=version --no-info
--output=%{buildroot}%{_mandir}/man1/haxelib.1
%check
-%{buildroot}/%{_bindir}/haxe --help
+%{buildroot}%{_bindir}/haxe -version
+pushd tests/unit && %{buildroot}%{_bindir}/haxe compile-macro.hxml && popd
%files
%defattr(-,root,root)
-%doc README.md
-%{_bindir}/haxe*
-%{haxelib}
+%doc README.md extra/LICENSE.txt extra/CHANGES.txt extra/CONTRIB.txt
+%{_bindir}/haxe
+%{_bindir}/haxelib
+%{_mandir}/man1/haxe.1*
+%{_mandir}/man1/haxelib.1*
+%{_datadir}/%{name}/
%changelog
++++++ haxe-3.2.0.tar.gz -> haxe-3.2.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/haxe/haxe-3.2.0.tar.gz
/work/SRC/openSUSE:Factory/.haxe.new/haxe-3.2.1.tar.gz differ: char 16, line 1
