Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libmaxminddb.git#349ed64d2dd78302d5e0869a319db7872c2cf015
This commit is contained in:
DistroBaker 2020-12-10 15:44:01 +00:00
parent afbf14bbae
commit eaa8cd4a39
2 changed files with 24 additions and 4 deletions

View File

@ -1,7 +1,7 @@
Name: libmaxminddb Name: libmaxminddb
Summary: C library for the MaxMind DB file format Summary: C library for the MaxMind DB file format
Version: 1.4.2 Version: 1.4.3
Release: 3%{?dist} Release: 1%{?dist}
URL: https://maxmind.github.io/libmaxminddb URL: https://maxmind.github.io/libmaxminddb
Source: https://github.com/maxmind/libmaxminddb/releases/download/%{version}/%{name}-%{version}.tar.gz Source: https://github.com/maxmind/libmaxminddb/releases/download/%{version}/%{name}-%{version}.tar.gz
@ -45,6 +45,21 @@ LD_PRELOAD=%{buildroot}%{_libdir}/libmaxminddb.so make check
%make_install %make_install
rm -v %{buildroot}%{_libdir}/*.la rm -v %{buildroot}%{_libdir}/*.la
#downstream fix for 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
%files %files
%license LICENSE %license LICENSE
%{_libdir}/libmaxminddb.so.0* %{_libdir}/libmaxminddb.so.0*
@ -55,12 +70,17 @@ rm -v %{buildroot}%{_libdir}/*.la
%license NOTICE %license NOTICE
%doc Changes.md %doc Changes.md
%{_includedir}/maxminddb.h %{_includedir}/maxminddb.h
%{_includedir}/maxminddb_config.h %{_includedir}/maxminddb_config*.h
%{_libdir}/libmaxminddb.so %{_libdir}/libmaxminddb.so
%{_libdir}/pkgconfig/libmaxminddb.pc %{_libdir}/pkgconfig/libmaxminddb.pc
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%changelog %changelog
* Thu Dec 10 2020 Michal Ruprich <mruprich@redhat.com> - 1.4.3-1
- Update to 1.4.3
- Resolves: #1758843 - libmaxminddb-devel i686 can't be installed in parallel to x86_64
- Fix for CVE-2020-28241
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (libmaxminddb-1.4.2.tar.gz) = bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1 SHA512 (libmaxminddb-1.4.3.tar.gz) = 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e