From 3ffa4a2187d3ce277ba1201caf50d28dff6b907c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Aug 30 2019 16:25:53 +0000 Subject: Ver. 0.3.0 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index c08a877..e4c285c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /erlang-rpm-macros-0.2.7.tar.gz /erlang-rpm-macros-0.2.8.tar.gz /erlang-rpm-macros-0.2.9.tar.gz +/erlang-rpm-macros-0.3.0.tar.gz diff --git a/erlang-rpm-macros-0001-Don-t-use-byte-strings.patch b/erlang-rpm-macros-0001-Don-t-use-byte-strings.patch deleted file mode 100644 index 1418995..0000000 --- a/erlang-rpm-macros-0001-Don-t-use-byte-strings.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Peter Lemenkov -Date: Mon, 30 Jul 2018 15:46:19 +0300 -Subject: [PATCH] Don't use byte strings - -Signed-off-by: Peter Lemenkov - -diff --git a/erlang-find-requires.py b/erlang-find-requires.py -index 1aa3d98..ca32d1f 100755 ---- a/erlang-find-requires.py -+++ b/erlang-find-requires.py -@@ -190,7 +190,7 @@ def check_for_mfa(Path, Dict, MFA): - def inspect_so_library(library, export_name, dependency_name): - with open(library, 'rb') as f: - elffile = ELFFile(f) -- dynsym = elffile.get_section_by_name(b'.dynsym') -+ dynsym = elffile.get_section_by_name('.dynsym') - for sym in dynsym.iter_symbols(): - if sym.name == export_name: - ts = rpm.TransactionSet() -@@ -288,8 +288,8 @@ if __name__ == "__main__": - Ret = inspect_beam_file(ISA, filename) - - elif filename.endswith(".so"): -- Ret += [inspect_so_library(filename, b'nif_init', 'erlang(erl_nif_version)')] -- Ret += [inspect_so_library(filename, b'driver_init', 'erlang(erl_drv_version)')] -+ Ret += [inspect_so_library(filename, 'nif_init', 'erlang(erl_nif_version)')] -+ Ret += [inspect_so_library(filename, 'driver_init', 'erlang(erl_drv_version)')] - - elif filename.endswith(".app"): - # TODO we don't know what to do with *.app files yet -diff --git a/testing.py b/testing.py -index 2fe2f22..4a5c263 100644 ---- a/testing.py -+++ b/testing.py -@@ -19,12 +19,12 @@ class TestAllMethods(unittest.TestCase): - def test_inspect_so_library_nif(self): - # This test requires erlang-crypto RPM package installed - filepath = glob.glob("/usr/lib*/erlang/lib/crypto-*/priv/lib/crypto.so")[0] -- self.assertEqual(M.inspect_so_library(filepath, b'nif_init', 'erlang(erl_nif_version)'), ErlNifDep) -+ self.assertEqual(M.inspect_so_library(filepath, 'nif_init', 'erlang(erl_nif_version)'), ErlNifDep) - - def test_inspect_so_library_drv(self): - # This test requires erlang-erlsyslog RPM package installed - filepath = glob.glob("/usr/lib*/erlang/lib/erlsyslog-*/priv/erlsyslog_drv.so")[0] -- self.assertEqual(M.inspect_so_library(filepath, b'driver_init', 'erlang(erl_drv_version)'), ErlDrvDep) -+ self.assertEqual(M.inspect_so_library(filepath, 'driver_init', 'erlang(erl_drv_version)'), ErlDrvDep) - - def test_inspect_beam_file_arch(self): - Deps = ['erlang-erts(x86-64)', 'erlang-kernel(x86-64)', 'erlang-stdlib(x86-64)'] diff --git a/erlang-rpm-macros.spec b/erlang-rpm-macros.spec index c6117c1..9c1c841 100644 --- a/erlang-rpm-macros.spec +++ b/erlang-rpm-macros.spec @@ -1,12 +1,11 @@ Name: erlang-rpm-macros -Version: 0.2.9 -Release: 5%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Macros for simplifying building of Erlang packages License: MIT URL: https://github.com/fedora-erlang/erlang-rpm-macros VCS: scm:git:https://github.com/fedora-erlang/erlang-rpm-macros.git Source0: https://github.com/fedora-erlang/erlang-rpm-macros/archive/%{version}/%{name}-%{version}.tar.gz -Patch1: erlang-rpm-macros-0001-Don-t-use-byte-strings.patch BuildArch: noarch # These BRs needed only for testing BuildRequires: erlang-crypto @@ -58,6 +57,9 @@ make check %changelog +* Fri Aug 30 2019 Peter Lemenkov - 0.3.0-1 +- Ver. 0.3.0 + * Wed Jul 24 2019 Fedora Release Engineering - 0.2.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 42258bc..7a2c184 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (erlang-rpm-macros-0.2.9.tar.gz) = b081332065f92be899d0d510a84e114cede60a849c73c504ca0b307a94f1af4501c98f1f2e988fbe6d45b3d350fac2489cf0ac55a282ae628aa8e9006347c97b +SHA512 (erlang-rpm-macros-0.3.0.tar.gz) = 70bbe64d6c653d43464ade4689776a480a23ef4fa213d5fb7651cfb05e78578a5113002829cf513c311c5355f0a4c62c2aa6a17de2e0a03f49ef621cf4d5dff5