From cb981bf522dd1974ed71b241f877b621bdbf9ef8 Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Feb 17 2020 15:10:28 +0000 Subject: Update to 1.10.1 (#1787846) Signed-off-by: Randy Barlow --- diff --git a/.gitignore b/.gitignore index 56f8ac2..ff36d27 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /jose-1.8.4.tar.gz +/jose-1.10.1.tar.gz diff --git a/0000-Use-include-instead-of-include_lib-for-jose-in-tests.patch b/0000-Use-include-instead-of-include_lib-for-jose-in-tests.patch deleted file mode 100644 index 2362e5c..0000000 --- a/0000-Use-include-instead-of-include_lib-for-jose-in-tests.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 52a1c2cec5fbf05fda55061834e39aba10a0f85f Mon Sep 17 00:00:00 2001 -From: Randy Barlow -Date: Sun, 14 Jan 2018 11:21:12 -0500 -Subject: [PATCH] Use include instead of include_lib for jose in tests. - -fixes #41 - -Signed-off-by: Randy Barlow ---- - test/jose_SUITE.erl | 2 +- - test/property_test/jose_jwk_kty_okp_ed25519_props.erl | 2 +- - test/property_test/jose_jwk_kty_okp_ed448_props.erl | 2 +- - test/property_test/jose_jwk_kty_okp_x25519_props.erl | 2 +- - test/property_test/jose_jwk_kty_okp_x448_props.erl | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/test/jose_SUITE.erl b/test/jose_SUITE.erl -index 8645bd0..dcc9393 100644 ---- a/test/jose_SUITE.erl -+++ b/test/jose_SUITE.erl -@@ -3,7 +3,7 @@ - -module(jose_SUITE). - - -include_lib("common_test/include/ct.hrl"). ---include_lib("jose/include/jose_public_key.hrl"). -+-include("jose_public_key.hrl"). - -include_lib("public_key/include/public_key.hrl"). - - -include("jose.hrl"). -diff --git a/test/property_test/jose_jwk_kty_okp_ed25519_props.erl b/test/property_test/jose_jwk_kty_okp_ed25519_props.erl -index 0b76d5a..e7c9205 100644 ---- a/test/property_test/jose_jwk_kty_okp_ed25519_props.erl -+++ b/test/property_test/jose_jwk_kty_okp_ed25519_props.erl -@@ -2,7 +2,7 @@ - %% vim: ts=4 sw=4 ft=erlang noet - -module(jose_jwk_kty_okp_ed25519_props). - ---include_lib("jose/include/jose_public_key.hrl"). -+-include("jose_public_key.hrl"). - - -include_lib("triq/include/triq.hrl"). - -diff --git a/test/property_test/jose_jwk_kty_okp_ed448_props.erl b/test/property_test/jose_jwk_kty_okp_ed448_props.erl -index fb01223..607d3f7 100644 ---- a/test/property_test/jose_jwk_kty_okp_ed448_props.erl -+++ b/test/property_test/jose_jwk_kty_okp_ed448_props.erl -@@ -2,7 +2,7 @@ - %% vim: ts=4 sw=4 ft=erlang noet - -module(jose_jwk_kty_okp_ed448_props). - ---include_lib("jose/include/jose_public_key.hrl"). -+-include("jose_public_key.hrl"). - - -include_lib("triq/include/triq.hrl"). - -diff --git a/test/property_test/jose_jwk_kty_okp_x25519_props.erl b/test/property_test/jose_jwk_kty_okp_x25519_props.erl -index 82c034d..919d868 100644 ---- a/test/property_test/jose_jwk_kty_okp_x25519_props.erl -+++ b/test/property_test/jose_jwk_kty_okp_x25519_props.erl -@@ -2,7 +2,7 @@ - %% vim: ts=4 sw=4 ft=erlang noet - -module(jose_jwk_kty_okp_x25519_props). - ---include_lib("jose/include/jose_public_key.hrl"). -+-include("jose_public_key.hrl"). - - -include_lib("triq/include/triq.hrl"). - -diff --git a/test/property_test/jose_jwk_kty_okp_x448_props.erl b/test/property_test/jose_jwk_kty_okp_x448_props.erl -index da0e38f..1a4c109 100644 ---- a/test/property_test/jose_jwk_kty_okp_x448_props.erl -+++ b/test/property_test/jose_jwk_kty_okp_x448_props.erl -@@ -2,7 +2,7 @@ - %% vim: ts=4 sw=4 ft=erlang noet - -module(jose_jwk_kty_okp_x448_props). - ---include_lib("jose/include/jose_public_key.hrl"). -+-include("jose_public_key.hrl"). - - -include_lib("triq/include/triq.hrl"). - --- -2.15.1 - diff --git a/0001-Remove-warnings_as_errors-to-work-around-47.patch b/0001-Remove-warnings_as_errors-to-work-around-47.patch deleted file mode 100644 index 4211000..0000000 --- a/0001-Remove-warnings_as_errors-to-work-around-47.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a1f53b19dc66f1723b1ec60e784bdd920a340434 Mon Sep 17 00:00:00 2001 -From: Randy Barlow -Date: Sun, 25 Mar 2018 17:21:21 -0400 -Subject: [PATCH] Remove warnings_as_errors to work around #47. - -https://github.com/potatosalad/erlang-jose/issues/47 - -Signed-off-by: Randy Barlow ---- - rebar.config | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/rebar.config b/rebar.config -index 829d879..531c4a5 100644 ---- a/rebar.config -+++ b/rebar.config -@@ -2,8 +2,7 @@ - %% vim: ts=4 sw=4 ft=erlang noet - {erl_opts, [ - {platform_define, "(?=^[0-9]+)(?!^17$)", optional_callbacks}, -- debug_info, -- warnings_as_errors -+ debug_info - ]}. - {deps, [ - {base64url, ".*", {git, "git://github.com/dvv/base64url.git", {branch, "master"}}} --- -2.16.2 - diff --git a/erlang-jose.spec b/erlang-jose.spec index 0670bb5..193733a 100644 --- a/erlang-jose.spec +++ b/erlang-jose.spec @@ -2,20 +2,17 @@ Name: erlang-%{srcname} -Version: 1.8.4 -Release: 8%{?dist} +Version: 1.10.1 +Release: 1%{?dist} BuildArch: noarch -License: MPLv2.0 +License: MIT Summary: JSON Object Signing and Encryption (JOSE) for Erlang and Elixir URL: https://github.com/potatosalad/erlang-jose Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -# https://github.com/potatosalad/erlang-jose/pull/42 -Patch0: 0000-Use-include-instead-of-include_lib-for-jose-in-tests.patch -# Workaround for https://github.com/potatosalad/erlang-jose/issues/47 -Patch1: 0001-Remove-warnings_as_errors-to-work-around-47.patch BuildRequires: erlang-base64url +BuildRequires: erlang-proper BuildRequires: erlang-rebar BuildRequires: erlang-triq @@ -41,7 +38,7 @@ BuildRequires: erlang-triq %files -%license LICENSE +%license LICENSE.md %doc ALGORITHMS.md %doc CHANGELOG.md %doc examples @@ -50,6 +47,10 @@ BuildRequires: erlang-triq %changelog +* Fri Feb 14 2020 Randy Barlow - 1.10.1-1 +- Update to 1.10.1 (#1787846). +- https://github.com/potatosalad/erlang-jose/blob/1.10.1/CHANGELOG.md + * Tue Jan 28 2020 Fedora Release Engineering - 1.8.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 0d4eb61..a038b38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jose-1.8.4.tar.gz) = 47171b4e5f6b61735a15365b4130c110c14de1f4b157cdbf97b448550d48de4ab27a30537e9d9f613d87862d592b3bd95638daacee60f3f5b9877d80a3de773b +SHA512 (jose-1.10.1.tar.gz) = 2887a1d43e212516b32a0a690d5a94e6a797b4802b21fa0a51cc4830790f56625575db38af8fb1c0f4cf4694740c6149eb75989cfbd51867af69c1b23b7ba8ee