diff --git a/argon2.spec b/argon2.spec index 6048973..4e24279 100644 --- a/argon2.spec +++ b/argon2.spec @@ -1,10 +1,12 @@ +%define make %__make OPTFLAGS="%{optflags}" LIBRARY_REL=%{_lib} + 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 Requires: libargon2%{?_isa} = %{version}-%{release} @@ -51,36 +53,22 @@ This package contains dynamic library for argon2 %package_help %prep -%setup -qn phc-winner-argon2-1c4fc41f81f358283755eea88d4ecd05e43b7fd3 - -if ! grep -q 'soname,libargon2.so.*' 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 +%setup -qn phc-winner-argon2-62358ba2123abd17fccf2a108a301d4b52c01a7c sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \ - -e 's:-O3 -Wall:%{optflags}:' \ - -e '/^LIBRARY_REL/s:lib:%{_lib}:' \ + -e 's:-O3 -Wall -g:%{optflags}:' \ -e 's:-march=\$(OPTTARGET) :${CFLAGS} :' \ -e 's:CFLAGS += -march=\$(OPTTARGET)::' \ -i Makefile %build -make -j1 +%make %{?_smp_mflags} %install -%make_install +%make DESTDIR=%{buildroot} install %delete_la_and_a - -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 - %check make test @@ -113,6 +101,9 @@ make test %{_mandir}/man1/* %changelog +* Fri Jul 3 2020 wangchen - 20190702-1 +- update argon2 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 3059d42..0000000 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 0000000..c5edeb6 Binary files /dev/null and b/phc-winner-argon2-20190702-62358ba.tar.gz differ