import libmaxminddb-1.2.0-7.el8

SPECS/libmaxminddb.spec

@@ -1,7 +1,7 @@
 Name:           libmaxminddb
 Summary:        C library for the MaxMind DB file format
 Version:        1.2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 URL:            https://maxmind.github.io/libmaxminddb
 Source0:        https://github.com/maxmind/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
 
@@ -44,6 +44,22 @@ LD_PRELOAD=%{buildroot}%{_libdir}/libmaxminddb.so make check
 %make_install
 rm -fv %{buildroot}%{_libdir}/*.la
 
+#fix multilib install of devel pkg
+mv %{buildroot}%{_includedir}/maxminddb_config.h \
+   %{buildroot}%{_includedir}/maxminddb_config-%{__isa_bits}.h
+cat > %{buildroot}%{_includedir}/maxminddb_config.h << EOF
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include <maxminddb_config-32.h>
+#elif __WORDSIZE == 64
+#include <maxminddb_config-64.h>
+#else
+#error "Unknown word size"
+#endif
+EOF
+
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -57,13 +73,16 @@ rm -fv %{buildroot}%{_libdir}/*.la
 %doc Changes.md
 %{_bindir}/mmdblookup
 %{_includedir}/maxminddb.h
-%{_includedir}/maxminddb_config.h
+%{_includedir}/maxminddb_config*.h
 %{_libdir}/libmaxminddb.so
 %{_libdir}/pkgconfig/libmaxminddb.pc
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan 09 2020 Michal Ruprich <mruprich@redhat.com> - 1.2.0-7
+- Resolves: #1788956 - conflicts with multilib install
+
 * Thu Aug 02 2018 Michal Ruprich <mruprich@redhat.com> - 1.2.0-6
 - Adding libmaxminddb as a new package to RHEL-8 (rhbz#1607927)
 - Adding Recommends tag for geolite2 databases