From 984445414d1f345f52652f931927e7374181c263 Mon Sep 17 00:00:00 2001 From: Sergio Correia Date: Fri, 7 May 2021 11:40:19 -0300 Subject: [PATCH] Update to new jose upstream release, v11. Resolves: rhbz#1935983 Resolves: rhbz#1958067 --- .gitignore | 1 + jose.spec | 30 ++++++++++++++++++------------ sources | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 01d6952..7077035 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /jose-9.tar.bz2 /jose-10.tar.bz2 +/jose-11.tar.xz diff --git a/jose.spec b/jose.spec index 1c01611..6130c71 100644 --- a/jose.spec +++ b/jose.spec @@ -1,18 +1,21 @@ Name: jose -Version: 10 -Release: 10%{?dist} +Version: 11 +Release: 1%{?dist} Summary: Tools for JSON Object Signing and Encryption (JOSE) License: ASL 2.0 URL: https://github.com/latchset/%{name} -Source0: https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 +Source0: https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz BuildRequires: gcc BuildRequires: pkgconfig BuildRequires: jansson-devel >= 2.10 BuildRequires: openssl-devel BuildRequires: zlib-devel -BuildRequires: make +BuildRequires: git-core +BuildRequires: meson +BuildRequires: ninja-build +BuildRequires: asciidoc Requires: lib%{name}%{?_isa} = %{version}-%{release} %description @@ -45,28 +48,26 @@ Obsoletes: lib%{name}-zlib-devel < %{version}-%{release} This package contains development files for lib%{name}. %prep -%setup -q +%autosetup -S git %build -%if 0%{?rhel} -%__sed -i 's|libcrypto >= 1\.0\.2|libcrypto >= 1\.0\.1|' configure -%endif -%configure --disable-openmp -%make_build +%meson +%meson_build %install rm -rf %{buildroot} -%make_install +%meson_install rm -rf %{buildroot}/%{_libdir}/lib%{name}.la %check -%make_build check +%meson_test %ldconfig_scriptlets -n lib%{name} %files %{_bindir}/%{name} %{_mandir}/man1/jose*.1* +%license COPYING %files -n lib%{name} %license COPYING @@ -80,6 +81,11 @@ rm -rf %{buildroot}/%{_libdir}/lib%{name}.la %{_mandir}/man3/jose*.3* %changelog +* Fri May 07 2021 Sergio Correia - 11-1 +- Update to new jose upstream release, v11. + Resolves: rhbz#1935983 + Resolves: rhbz#1958067 + * Fri Apr 16 2021 Mohan Boddu - 10-10 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/sources b/sources index a597913..b73042f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jose-10.tar.bz2) = 596f71bf7f3ab65164556d8353c07a09283e80ad06f8cbb7b1a9609fe3c95888c94c032ae8d719ed3f3b361cb87188f4683728e649d454056841b8ca47828b9d +SHA512 (jose-11.tar.xz) = 61aa7aad85694e693f451e328e81dc7d84d4bd7662152213f1ef45fd010db7180a93d67398888fc9476ee04e4eb7dd7483cfcebc47d5773cfe04b8b5f3786006