!7 openEuler-argon2

Merge pull request !7 from Liquor/master
This commit is contained in:
openeuler-ci-bot 2020-07-23 19:07:47 +08:00 committed by Gitee
commit 1a9b57c489
3 changed files with 10 additions and 8 deletions

View File

@ -1,12 +1,12 @@
Name: argon2 Name: argon2
Version: 20161029 Version: 20171227
Release: 10 Release: 1
Summary: A password-hashing tool Summary: A password-hashing tool
License: Public Domain or ASL 2.0 License: Public Domain or ASL 2.0
URL: https://github.com/P-H-C/phc-winner-argon2 URL: https://github.com/P-H-C/phc-winner-argon2
Source0: https://github.com/P-H-C/phc-winner-argon2/archive/1c4fc41f81f358283755eea88d4ecd05e43b7fd3/phc-winner-argon2-20161029-1c4fc41.tar.gz Source0: https://github.com/P-H-C/phc-winner-argon2/archive/670229c849b9fe882583688b74eb7dfdc846f9f6/phc-winner-argon2-20171227-670229c.tar.gz
BuildRequires: gcc BuildRequires: gcc
BuildRequires: libargon2
Requires: libargon2%{?_isa} = %{version}-%{release} Requires: libargon2%{?_isa} = %{version}-%{release}
%description %description
@ -51,9 +51,9 @@ This package contains dynamic library for argon2
%package_help %package_help
%prep %prep
%setup -qn phc-winner-argon2-1c4fc41f81f358283755eea88d4ecd05e43b7fd3 %setup -qn phc-winner-argon2-670229c849b9fe882583688b74eb7dfdc846f9f6
if ! grep -q 'soname,libargon2.so.*' Makefile; then if ! grep -q 'ABI_VERSION = 1' Makefile; then
: soname have changed : soname have changed
grep soname Makefile grep soname Makefile
exit 1 exit 1
@ -78,8 +78,7 @@ make -j1
install -Dpm 644 libargon2.pc %{buildroot}%{_libdir}/pkgconfig/libargon2.pc install -Dpm 644 libargon2.pc %{buildroot}%{_libdir}/pkgconfig/libargon2.pc
install -Dpm 644 man/argon2.1 %{buildroot}%{_mandir}/man1/argon2.1 install -Dpm 644 man/argon2.1 %{buildroot}%{_mandir}/man1/argon2.1
mv %{buildroot}%{_libdir}/libargon2.so %{buildroot}%{_libdir}/libargon2.so.0 cp -p %{_libdir}/libargon2.so.0 %{buildroot}%{_libdir}
ln -s libargon2.so.0 %{buildroot}%{_libdir}/libargon2.so
%check %check
make test make test
@ -113,6 +112,9 @@ make test
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Mon Jul 20 2020 Liquor <lirui130@huawei.com> - 20171227-1
- update to 20171227
* Mon Jul 6 2020 Liquor <lirui130@huawei.com> - 20161029-10 * Mon Jul 6 2020 Liquor <lirui130@huawei.com> - 20161029-10
- revert "update argon2 to 20190702" - revert "update argon2 to 20190702"

Binary file not shown.