diff --git a/argon2.spec b/argon2.spec index 3b63c86..c3522ce 100644 --- a/argon2.spec +++ b/argon2.spec @@ -7,25 +7,23 @@ # Please, preserve the changelog entries # %global libname libargon2 -%global gh_commit 670229c849b9fe882583688b74eb7dfdc846f9f6 +%global gh_commit 62358ba2123abd17fccf2a108a301d4b52c01a7c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner P-H-C %global gh_project phc-winner-argon2 %global soname 1 -%global upstream_version 20171227 +%global upstream_version 20190702 #global upstream_prever RC1 Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 10%{?dist} +Release: 1%{?dist} Summary: The password-hashing tools License: Public Domain or ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz -Patch0: argon2-Use-explicit_bzero-on-recent-glibc-versions.patch -Patch1: argon2-Wait-for-already-running-threads-if-a-thread-creatio.patch BuildRequires: gcc BuildRequires: make @@ -76,8 +74,6 @@ developing applications that use %{libname}. %prep %setup -qn %{gh_project}-%{gh_commit} -%patch0 -p1 -%patch1 -p1 if ! grep -q 'ABI_VERSION = %{soname}' Makefile; then : soname have changed @@ -86,7 +82,7 @@ if ! grep -q 'ABI_VERSION = %{soname}' Makefile; then fi # Fix pkgconfig file -sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i %{libname}.pc +sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i %{libname}.pc.in %build # Honours default RPM build options and library path, do not use -march=native @@ -102,7 +98,7 @@ make -j1 %install -make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} LIBRARY_REL=%{_lib} # Drop static library rm %{buildroot}%{_libdir}/%{libname}.a @@ -112,7 +108,7 @@ install -Dpm 644 %{libname}.pc %{buildroot}%{_libdir}/pkgconfig/%{libname}.pc # Fix perms chmod -x %{buildroot}%{_includedir}/%{name}.h - +chmod +x %{buildroot}%{_libdir}/%{libname}.so.%{soname} %check make test @@ -135,6 +131,9 @@ make test %changelog +* Tue Aug 2 2022 Tom Callaway - 20190702-1 +- update to 20190702 + * Wed Jul 20 2022 Fedora Release Engineering - 20171227-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild