up to 20190702

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

diff --git a/libargon2.spec b/libargon2.spec
index a86ea8ea23f166e82d9406ca582901a6659d223e..f7a2a96994c7a13f1da90ed872f9f75f707e0950 100644 (file)
--- 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 27c8c36c68814a1e30d869255c1cd8af11769747..e56bff7e859c7292e8d3c126dae60f62ba864c4b 100644 (file)
--- 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))