Merge branch 'master' into el6

2020-01-18 21:57:32 +00:00 · 2019-11-13 18:20:53 +00:00 · 2019-05-19 18:27:40 +01:00 · 2019-05-19 18:18:20 +01:00 · 2019-04-15 13:16:05 +01:00 · 2019-04-15 13:05:19 +01:00
1 changed files with 6 additions and 2 deletions
--- a/zchunk.spec
+++ b/zchunk.spec
@ -52,6 +52,11 @@ library, libzck.
 rm -rf src/lib/hash/sha*

 %build
+#Needed for EL6
+%global _vpath_srcdir .
+%global _vpath_builddir build
+%global __global_ldflags ""
+
 %meson -Dwith-openssl=enabled -Dwith-zstd=enabled
 %meson_build

@ -72,8 +77,7 @@ install contrib/gen_xml_dictionary %{buildroot}%{_libexecdir}/zck_gen_xml_dictio
 %{_libexecdir}/zck_gen_xml_dictionary

 %files libs
-%license LICENSE
-%doc README.md
+%doc README.md LICENSE
 %{_libdir}/libzck.so.*

 %files devel
Author	SHA1	Message	Date
Jonathan Dieter	5a525e3d6b	Merge branch 'master' into el6	2020-01-18 21:57:32 +00:00
Jonathan Dieter	5a8c47f713	Merge branch 'master' into el6	2019-11-13 18:20:53 +00:00
Jonathan Dieter	75b4380d12	Merge branch 'master' into el6	2019-05-19 18:27:40 +01:00
Jonathan Dieter	589427e7f4	Merge branch 'master' into el6	2019-05-19 18:18:20 +01:00
Jonathan Dieter	fd93d43531	Merge branch 'master' into el6	2019-04-15 13:16:05 +01:00
Jonathan Dieter	5a11f955cc	Fix build for EL6 Signed-off-by: Jonathan Dieter <jdieter@gmail.com>	2019-04-15 13:05:19 +01:00