[packages/libargon2] up to 20190702

[atler]

commit 4a7a54c4f99f4a88fd73996799e98bd837c213e3
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jul 9 00:28:10 2019 +0200

    up to 20190702
    
    - get rid of custom sed commands in favor of passing correct vars

 libargon2.spec | 10 +++++-----
 makefile.patch |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libargon2.spec b/libargon2.spec
index a86ea8e..f7a2a96 100644
--- a/libargon2.spec
+++ b/libargon2.spec
@@ -5,12 +5,12 @@
 Summary:	The password hash Argon2, winner of PHC
 Summary(pl.UTF-8):	Skrót haseł Argon2 - zwycięzca PHC
 Name:		libargon2
-Version:	20171227
+Version:	20190702
 Release:	1
 License:	Apache v2.0, CC0 v1.0
 Group:		Libraries
 Source0:	https://github.com/P-H-C/phc-winner-argon2/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	7d0a85aa3fa02a5962ff751a6e2078c8
+# Source0-md5:	0f234cc21ac6cebfe373da6afa70bb1d
 Patch0:		makefile.patch
 URL:		https://github.com/P-H-C/phc-winner-argon2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -76,6 +76,9 @@ Statyczna biblioteka libargon2.
 CFLAGS="%{rpmcflags}" \
 %{__make} \
 	CC="%{__cc}" \
+	ARGON2_VERSION=%{version} \
+	PREFIX=%{_prefix} \
+	LIBRARY_REL=%{_lib} \
 	%{!?with_static_libs:LIBRARIES='$(LIB_SH)'}
 
 %install
@@ -89,9 +92,6 @@ install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 	LIBRARY_REL=%{_lib} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__sed} libargon2.pc -e 's#libdir=.*#libdir=${prefix}/%{_lib}#g' \
-	-e 's#@UPSTREAM_VER@#%{version}#g' >$RPM_BUILD_ROOT%{_pkgconfigdir}/libargon2.pc
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/makefile.patch b/makefile.patch
index 27c8c36..e56bff7 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -44,6 +44,6 @@ diff -urN phc-winner-argon2-20171227.org/Makefile phc-winner-argon2-20171227/Mak
 +	mv $(INST_LIBRARY)/$(LIB_SH) $(INST_LIBRARY)/$(LIB_SH_VERSION)
 +	# keep symlink for development
 +	ln -sf $(LIB_SH_VERSION) $(INST_LIBRARY)/$(LIB_SH)
+ 	$(INSTALL) -d $(INST_PKGCONFIG)
+ 	$(INSTALL) -m 0644 $(PC_NAME) $(INST_PKGCONFIG)
  
- uninstall:
- 	cd $(INST_INCLUDE) && rm -f $(notdir $(HEADERS))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libargon2.git/commitdiff/4a7a54c4f99f4a88fd73996799e98bd837c213e3