diff --git a/argon2.spec b/argon2.spec index 6048973364a175fb621648aca655e771da6e9564..e56effe40ae00b09c289f390e17ae582ad0602c7 100644 --- a/argon2.spec +++ b/argon2.spec @@ -1,12 +1,13 @@ Name: argon2 -Version: 20161029 -Release: 9 +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/1c4fc41f81f358283755eea88d4ecd05e43b7fd3/phc-winner-argon2-20161029-1c4fc41.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} %description @@ -51,15 +52,15 @@ This package contains dynamic library for argon2 %package_help %prep -%setup -qn phc-winner-argon2-1c4fc41f81f358283755eea88d4ecd05e43b7fd3 +%setup -qn phc-winner-argon2-62358ba2123abd17fccf2a108a301d4b52c01a7c -if ! grep -q 'soname,libargon2.so.*' Makefile; then +if ! grep -q 'ABI_VERSION = 1' Makefile; then : soname have changed grep soname Makefile 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 +69,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,11 +78,11 @@ 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 -mv %{buildroot}%{_libdir}/libargon2.so %{buildroot}%{_libdir}/libargon2.so.0 -ln -s libargon2.so.0 %{buildroot}%{_libdir}/libargon2.so +cp -p %{_libdir}/libargon2.so.0 %{buildroot}%{_libdir} %check make test @@ -113,6 +116,9 @@ make test %{_mandir}/man1/* %changelog +* Tue Sep 1 2020 zhangxingliang - 20190702-1 +- update to 20190702 + * Sat Mar 21 2020 openEuler Buildteam - 20161029-9 - obsoletes argon2-devel diff --git a/phc-winner-argon2-20161029-1c4fc41.tar.gz b/phc-winner-argon2-20161029-1c4fc41.tar.gz deleted file mode 100644 index 3059d421c540f68127db1ea386661322aa8b2ba5..0000000000000000000000000000000000000000 Binary files a/phc-winner-argon2-20161029-1c4fc41.tar.gz and /dev/null differ diff --git a/phc-winner-argon2-20190702-62358ba.tar.gz b/phc-winner-argon2-20190702-62358ba.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c5edeb6a224dbe20679fb1cf1d966cf1a911579d Binary files /dev/null and b/phc-winner-argon2-20190702-62358ba.tar.gz differ