From b50a74b5790a9ce431c06dd18a2fd2552ea0fd66 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 5 May 2025 19:55:51 +0800 Subject: [PATCH] fix build with package notes --- argon2.spec | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/argon2.spec b/argon2.spec index 84cf280..5cf6752 100644 --- a/argon2.spec +++ b/argon2.spec @@ -1,8 +1,8 @@ Name: argon2 Version: 20190702 -Release: 4 +Release: 5 Summary: A password-hashing tool -License: Public Domain or ASL 2.0 +License: CC0-1.0 OR Apache-2.0 URL: https://github.com/P-H-C/phc-winner-argon2 Source0: https://github.com/P-H-C/phc-winner-argon2/archive/62358ba2123abd17fccf2a108a301d4b52c01a7c/phc-winner-argon2-20190702-62358ba.tar.gz @@ -64,6 +64,7 @@ fi sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i libargon2.pc.in +%build sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \ -e 's:-O3 -Wall:%{optflags}:' \ -e '/^LIBRARY_REL/s:lib:%{_lib}:' \ @@ -73,8 +74,7 @@ sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \ sed -e 's/\/x86_64-linux-gnu//g' -i Makefile -%build -make -j1 +make -j1 PREFIX=%{_prefix} %install %make_install @@ -87,26 +87,15 @@ install -Dpm 644 man/argon2.1 %{buildroot}%{_mandir}/man1/argon2.1 %check make test -%pre - -%preun - -%post -n libargon2 -p /sbin/ldconfig - -%postun -n libargon2 -p /sbin/ldconfig - %files -%defattr(-,root,root) %{_bindir}/%{name} %license LICENSE %files -n libargon2 -%defattr(-,root,root) %license LICENSE %{_libdir}/libargon2.so.* %files -n libargon2-devel -%defattr(-,root,root) %{_includedir}/%{name}.h %{_libdir}/libargon2.so %{_libdir}/pkgconfig/*pc @@ -116,6 +105,10 @@ make test %{_mandir}/man1/* %changelog +* Mon May 05 2025 Funda Wang - 20190702-5 +- fix build with package notes +- cleanup spec + * Wed Jul 31 2024 yixiangzhike - 20190702-4 - backport upstream patch to fix failure on existing symlink -- Gitee