[nekovm] New upstream version 2.0.0 (RHBZ#979806).

Mon Jul 1 08:22:40 UTC 2013

commit 719f8eef9f928212beb7279c58ae839d88dadad1
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Jul 1 09:09:18 2013 +0100

    New upstream version 2.0.0 (RHBZ#979806).
    
    - Rebase patches.
    - Unset MAKEFLAGS before build.
    - Make libneko.so be a symlink to libneko.so.1.

 .gitignore                |    1 +
 nekovm-extra-cflags.patch |   20 ++++++++++----------
 nekovm-set-soname.patch   |   17 ++++-------------
 nekovm.spec               |   19 +++++++++++++++++--
 sources                   |    2 +-
 5 files changed, 33 insertions(+), 26 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 996161b..95d5541 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 neko-1.8.1.tar.gz
 /neko-1.8.2.tar.gz
+/neko-2.0.0.tar.gz
diff --git a/nekovm-extra-cflags.patch b/nekovm-extra-cflags.patch
index d32925b..4f20154 100644
--- a/nekovm-extra-cflags.patch
+++ b/nekovm-extra-cflags.patch
@@ -1,20 +1,20 @@
---- neko-1.8.2/Makefile.orig	2012-01-16 13:25:06.687678254 +0000
-+++ neko-1.8.2/Makefile	2012-01-16 13:25:31.605123782 +0000
-@@ -2,7 +2,7 @@
+--- neko-2.0.0.old/Makefile	2013-07-01 09:15:00.027921673 +0100
++++ neko-2.0.0/Makefile	2013-07-01 09:16:15.140730351 +0100
+@@ -12,7 +12,7 @@
  
  INSTALL_PREFIX = /usr/local
  
--CFLAGS = -Wall -O3 -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -msse2 -mfpmath=sse -I libs/common
-+CFLAGS = $(EXTRA_CFLAGS) -Wall -O3 -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -msse2 -mfpmath=sse -I libs/common
+-CFLAGS = -Wall -O3 -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -I libs/common
++CFLAGS = $(EXTRA_CFLAGS) -Wall -O3 -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -I libs/common
  EXTFLAGS = -pthread
  MAKESO = $(CC) -shared -Wl,-Bsymbolic
  LIBNEKO_NAME = libneko.so
-@@ -37,7 +37,7 @@
- # For MINGW/MSYS
+@@ -34,7 +34,7 @@
+ ## MINGW SPECIFIC
  
- ifeq (${WIN32}, 1)
--CFLAGS = -g -Wall -O3 -momit-leaf-frame-pointer -I vm -I /usr/local/include -msse2 -mfpmath=sse -I libs/common
-+CFLAGS = $(EXTRA_CFLAGS) -g -Wall -O3 -momit-leaf-frame-pointer -I vm -I /usr/local/include -msse2 -mfpmath=sse -I libs/common
+ ifeq (${os}, mingw)
+-CFLAGS = -g -Wall -O3 -momit-leaf-frame-pointer -I vm -I /usr/local/include -I libs/common
++CFLAGS = $(EXTRA_CFLAGS) -g -Wall -O3 -momit-leaf-frame-pointer -I vm -I /usr/local/include -I libs/common
  EXTFLAGS =
  MAKESO = $(CC) -O -shared
  LIBNEKO_NAME = neko.dll
diff --git a/nekovm-set-soname.patch b/nekovm-set-soname.patch
index 0249323..62b552f 100644
--- a/nekovm-set-soname.patch
+++ b/nekovm-set-soname.patch
@@ -1,15 +1,6 @@
---- neko-1.8.2.old/Makefile	2011-09-10 09:52:00.000000000 +0100
-+++ neko-1.8.2/Makefile	2012-01-16 13:20:50.652100388 +0000
-@@ -4,7 +4,7 @@
- 
- CFLAGS = -Wall -O3 -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -msse2 -mfpmath=sse -I libs/common
- EXTFLAGS = -pthread
--MAKESO = $(CC) -shared -WBsymbolic
-+MAKESO = $(CC) -shared -Wl,-Bsymbolic
- LIBNEKO_NAME = libneko.so
- LIBNEKO_LIBS = -ldl -lgc -lm
- NEKOVM_FLAGS = -Lbin -lneko
-@@ -118,7 +118,8 @@
+--- neko-2.0.0.old/Makefile	2013-02-23 15:24:43.000000000 +0000
++++ neko-2.0.0/Makefile	2013-07-01 09:14:05.253061908 +0100
+@@ -97,7 +97,8 @@
  	(cd src; ${NEKO_EXEC} nekoc -link ../boot/nekoml.n nekoml/Main)
  
  bin/${LIBNEKO_NAME}: ${LIBNEKO_OBJECTS}
@@ -19,7 +10,7 @@
  
  bin/neko: $(VM_OBJECTS)
  	${CC} ${CFLAGS} ${EXTFLAGS} -o $@ ${VM_OBJECTS} ${NEKOVM_FLAGS}
-@@ -135,7 +136,7 @@
+@@ -114,7 +115,7 @@
  	rm -rf bin/mtypes bin/tools
  
  install:
diff --git a/nekovm.spec b/nekovm.spec
index d8bb3aa..9193d47 100644
--- a/nekovm.spec
+++ b/nekovm.spec
@@ -4,8 +4,8 @@
 %define _default_patch_fuzz 2
 
 Name:           nekovm
-Version:        1.8.2
-Release:        5%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        Neko embedded scripting language and virtual machine
 
 Group:          Development/Libraries
@@ -112,6 +112,9 @@ sed -i.sse 's/-msse2 -mfpmath=sse //g' Makefile
 # Avoid a compiler stack-overflow when building on 64 bit.
 ulimit -s unlimited
 
+# MAKEFLAGS=-jN breaks the build.
+unset MAKEFLAGS
+
 # Add the RPM flags to CFLAGS.
 make EXTRA_CFLAGS="$RPM_OPT_FLAGS"
 
@@ -135,6 +138,12 @@ if [ %{_prefix}/lib != %{_libdir} ]; then
   rmdir $RPM_BUILD_ROOT%{_prefix}/lib
 fi
 
+# Make libneko.so be a link, not a copy, of libneko.so.1.
+pushd $RPM_BUILD_ROOT%{_libdir}
+rm libneko.so
+ln -s libneko.so.1 libneko.so
+popd
+
 # Stop prelink from stripping the binaries - they contain bytecode.
 mkdir -p $RPM_BUILD_ROOT/etc/prelink.conf.d
 echo '-b /usr/bin/neko*' > $RPM_BUILD_ROOT/etc/prelink.conf.d/nekovm.conf
@@ -173,6 +182,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul  1 2013 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-1
+- New upstream version 2.0.0 (RHBZ#979806).
+- Rebase patches.
+- Unset MAKEFLAGS before build.
+- Make libneko.so be a symlink to libneko.so.1.
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index dc1b979..8f83e44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf4872046de59edf4278536ef0240b08  neko-1.8.2.tar.gz
+dd7a3629f7cb638e38e8c14aa83da4c5  neko-2.0.0.tar.gz
