!10 【Mainline】argon2 update to 20190702

Merge pull request !10 from yixiangzhike/master

argon2.spec

@@ -1,10 +1,10 @@
 Name:          argon2
-Version:       20171227
+Version:       20190702
 Release:       1
 Summary:       A password-hashing tool
 License:       Public Domain or ASL 2.0
 URL:           https://github.com/P-H-C/phc-winner-argon2
-Source0:       https://github.com/P-H-C/phc-winner-argon2/archive/670229c849b9fe882583688b74eb7dfdc846f9f6/phc-winner-argon2-20171227-670229c.tar.gz
+Source0:       https://github.com/P-H-C/phc-winner-argon2/archive/62358ba2123abd17fccf2a108a301d4b52c01a7c/phc-winner-argon2-20190702-62358ba.tar.gz
 BuildRequires: gcc
 BuildRequires: libargon2
 Requires:      libargon2%{?_isa} = %{version}-%{release}
@@ -51,7 +51,7 @@ This package contains dynamic library for argon2
 %package_help
 
 %prep
-%setup -qn phc-winner-argon2-670229c849b9fe882583688b74eb7dfdc846f9f6
+%setup -qn phc-winner-argon2-62358ba2123abd17fccf2a108a301d4b52c01a7c
 
 if ! grep -q 'ABI_VERSION = 1' Makefile; then
   : soname have changed
@@ -59,7 +59,7 @@ if ! grep -q 'ABI_VERSION = 1' Makefile; then
   exit 1
 fi
 
-sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i libargon2.pc
+sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i libargon2.pc.in
 
 sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \
     -e 's:-O3 -Wall:%{optflags}:' \
@@ -68,6 +68,8 @@ sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \
     -e 's:CFLAGS += -march=\$(OPTTARGET)::' \
     -i Makefile
 
+sed -e 's/\/x86_64-linux-gnu//g' -i Makefile
+
 %build
 make -j1
 
@@ -75,6 +77,7 @@ make -j1
 %make_install
 %delete_la_and_a
 
+install -Dpm 755 libargon2.so.* %{buildroot}%{_libdir}/
 install -Dpm 644 libargon2.pc %{buildroot}%{_libdir}/pkgconfig/libargon2.pc
 install -Dpm 644 man/argon2.1 %{buildroot}%{_mandir}/man1/argon2.1
 
@@ -112,6 +115,9 @@ make test
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 1 2020 zhangxingliang <zhangxingliang3@huawei.com> - 20190702-1
+- update to 20190702
+
 * Mon Jul 20 2020 Liquor <lirui130@huawei.com> - 20171227-1
 - update to 20171227