From c361cd7323b0f205e700a9aa4f568e082644cce8d513ebf7e7c39792ae821feb Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Mon, 14 Aug 2017 13:49:27 +0000 Subject: [PATCH] Accepting request 516839 from home:tiwai:branches:security - Fix include header path to /usr/include/sha1dc/sha1.h as supposed by upstream installation - Remove conflicts with libmd-devel, as we changed the header path OBS-URL: https://build.opensuse.org/request/show/516839 OBS-URL: https://build.opensuse.org/package/show/security/sha1collisiondetection?expand=0&rev=9 --- sha1collisiondetection.changes | 7 +++++++ sha1collisiondetection.spec | 9 +++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sha1collisiondetection.changes b/sha1collisiondetection.changes index a63a206..1567d69 100644 --- a/sha1collisiondetection.changes +++ b/sha1collisiondetection.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 4 15:18:33 CEST 2017 - tiwai@suse.de + +- Fix include header path to /usr/include/sha1dc/sha1.h as supposed + by upstream installation +- Remove conflicts with libmd-devel, as we changed the header path + ------------------------------------------------------------------- Mon May 22 16:20:43 UTC 2017 - astieger@suse.com diff --git a/sha1collisiondetection.spec b/sha1collisiondetection.spec index b4ea56e..f4d4500 100644 --- a/sha1collisiondetection.spec +++ b/sha1collisiondetection.spec @@ -49,8 +49,6 @@ It is very fast and takes less than twice the amount of time as regular SHA-1. Summary: Development files for Group: Development/Libraries/C and C++ Requires: libsha1detectcoll1 = %{version} -# both libs offer /usr/include/sha1.h -Conflicts: libmd-devel %description -n libsha1detectcoll-devel This library was designed as near drop-in replacements for other sha1sum @@ -70,12 +68,11 @@ make %{?_smp_mflags} PREFIX=%{_prefix} mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_libdir} %make_install \ - INCLUDEDIR=%{buildroot}%{_includedir} \ - BINDIR=%{buildroot}%{_bindir} \ + PREFIX=%{buildroot}%{_prefix} \ LIBDIR=%{buildroot}%{_libdir} find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.a" -delete -print -chmod -x %{buildroot}%{_includedir}/sha1.h +chmod -x %{buildroot}%{_includedir}/sha1dc/sha1.h %check make %{?_smp_mflags} test @@ -96,7 +93,7 @@ make %{?_smp_mflags} test %files -n libsha1detectcoll-devel %defattr(-,root,root) %doc LICENSE.txt README.md -%{_includedir}/sha1.h +%{_includedir}/sha1dc %{_libdir}/libsha1detectcoll.so %changelog