Accepting request 516844 from security

1

OBS-URL: https://build.opensuse.org/request/show/516844
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sha1collisiondetection?expand=0&rev=4

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
 

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