From 96932f119424621d16e4f30f8766791a6a5a120a Mon Sep 17 00:00:00 2001 From: Filip Andres Date: Jun 29 2015 08:36:01 +0000 Subject: Update to 0.13.3 --- diff --git a/.gitignore b/.gitignore index 9a11f1e..2997542 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/0.8.5.tar.gz +/jiffy-137d3d94b6ee10001d761d412cbbe7f665680c98.tar.gz diff --git a/erlang-jiffy.spec b/erlang-jiffy.spec index d58ff34..b275d99 100644 --- a/erlang-jiffy.spec +++ b/erlang-jiffy.spec @@ -1,13 +1,14 @@ %global realname jiffy +%global commit 137d3d94b6ee10001d761d412cbbe7f665680c98 Name: erlang-%{realname} -Version: 0.8.5 -Release: 9%{?dist} +Version: 0.13.3 +Release: 1%{?dist} Summary: Erlang JSON parser Group: Development/Libraries License: MIT URL: https://github.com/davisp/jiffy -Source0: https://github.com/davisp/jiffy/archive/%{version}.tar.gz +Source0: https://github.com/davisp/jiffy/archive/%{commit}/%{realname}-%{commit}.tar.gz Patch0: jiffy-setting-a-fixed-version.patch Patch1: jiffy-cxxflags.patch Patch2: jiffy-system-double-conversion.patch @@ -28,7 +29,7 @@ A JSON parser for Erlang implemented as a NIF. %prep -%setup -q -n %{realname}-%{version} +%setup -q -n %{realname}-%{commit} %patch0 -p1 -b .version %patch1 -p1 -b .cxxflags %patch2 -p1 -b .system-double-conversion @@ -60,6 +61,9 @@ install -p priv/jiffy.so $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{vers %changelog +* Mon Jun 29 2015 Filip Andres - 0.13.1-1 +- Update to version 0.13.3 + * Wed Jun 17 2015 Fedora Release Engineering - 0.8.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/jiffy-cxxflags.patch b/jiffy-cxxflags.patch index c59fae5..9f43624 100644 --- a/jiffy-cxxflags.patch +++ b/jiffy-cxxflags.patch @@ -1,26 +1,25 @@ -From f82fcc0398807f5c2bb15ea79fbd3b45a069c3c4 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Mon, 10 Mar 2014 16:09:06 +0100 -Subject: [PATCH] Do not override CFLAGS +From ecdc7202fc661411bd712ac74fb679de408447f7 Mon Sep 17 00:00:00 2001 +From: Filip Andres +Date: Mon, 29 Jun 2015 09:27:22 +0200 +Subject: [PATCH] cxxflags -We don't like Werror there. --- rebar.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/rebar.config b/rebar.config -index f992d04..2c1c9df 100644 +index e805dba..ea16ac1 100644 --- a/rebar.config +++ b/rebar.config -@@ -7,8 +7,6 @@ - ]}. +@@ -8,8 +8,6 @@ {port_env, [ + {".*", "CFLAGS", "$CFLAGS -g -Wall -Werror -O3 -fno-strict-aliasing"}, - {".*", "CXXFLAGS", "$CXXFLAGS -g -Wall -Werror -O3"}, - {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin)", "LDFLAGS", "$LDFLAGS -lstdc++"}, -- -1.8.3.1 +2.1.0 diff --git a/jiffy-setting-a-fixed-version.patch b/jiffy-setting-a-fixed-version.patch index 9a477fb..5934a0b 100644 --- a/jiffy-setting-a-fixed-version.patch +++ b/jiffy-setting-a-fixed-version.patch @@ -1,27 +1,24 @@ -From 12faef1459c2447925edbd5806d61b59be1734a5 Mon Sep 17 00:00:00 2001 -From: Filip Andres -Date: Mon, 16 Apr 2012 10:57:13 +0200 -Subject: [PATCH] setting a fixed version - -[lubo.rintel@gooddata.com: Otherwise rebar tries to determine it using git -describe, which won't work for a tarred tree.] +From b4849d2f8ade693e429ce7bc8456cab7504fb88c Mon Sep 17 00:00:00 2001 +From: Filip Andres +Date: Mon, 29 Jun 2015 09:26:25 +0200 +Subject: [PATCH] fixed version --- - src/jiffy.app.src | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/jiffy.app.src | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jiffy.app.src b/src/jiffy.app.src -index 4ea304a..a0f6af3 100644 +index 6f49231..1542996 100644 --- a/src/jiffy.app.src +++ b/src/jiffy.app.src @@ -1,6 +1,6 @@ {application, jiffy, [ {description, "JSON Decoder/Encoder."}, - {vsn, git}, -+ {vsn, "0.8.5"}, ++ {vsn, "0.13.3"}, {registered, []}, - {applications, [kernel]} + {applications, [kernel, stdlib]} ]}. -- -1.7.8.4 +2.1.0 diff --git a/jiffy-system-double-conversion.patch b/jiffy-system-double-conversion.patch index 8424580..fb72af6 100644 --- a/jiffy-system-double-conversion.patch +++ b/jiffy-system-double-conversion.patch @@ -1,7 +1,17 @@ -diff -up jiffy-0.8.5/rebar.config~ jiffy-0.8.5/rebar.config ---- jiffy-0.8.5/rebar.config~ 2014-03-18 22:40:29.083883843 +0200 -+++ jiffy-0.8.5/rebar.config 2014-03-18 22:47:47.517790625 +0200 -@@ -1,14 +1,13 @@ +From 6f306b26f1af86a01250c914b9816add034dc494 Mon Sep 17 00:00:00 2001 +From: Filip Andres +Date: Mon, 29 Jun 2015 09:32:14 +0200 +Subject: [PATCH] double_conversion + +--- + rebar.config | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/rebar.config b/rebar.config +index ea16ac1..3a13e7d 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -1,15 +1,14 @@ {port_specs, [ {"priv/jiffy.so", [ "c_src/*.c", @@ -12,9 +22,13 @@ diff -up jiffy-0.8.5/rebar.config~ jiffy-0.8.5/rebar.config ]}. {port_env, [ + {".*", "CFLAGS", "$CFLAGS -g -Wall -Werror -O3 -fno-strict-aliasing"}, {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin)", - "LDFLAGS", "$LDFLAGS -lstdc++"}, + "LDFLAGS", "$LDFLAGS -lstdc++ -ldouble-conversion"}, %% OS X Leopard flags for 64-bit {"darwin9.*-64$", "CXXFLAGS", "-m64"}, +-- +2.1.0 + diff --git a/sources b/sources index 8514fd4..1b620aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19fb2adcb37423b59534f08787298d17 0.8.5.tar.gz +32fd17efe3910be2cd0e566dfe6c2460 jiffy-137d3d94b6ee10001d761d412cbbe7f665680c98.tar.gz