diff --git a/SPECS/libmaxminddb.spec b/SPECS/libmaxminddb.spec index 698ff0d..bc3d280 100644 --- a/SPECS/libmaxminddb.spec +++ b/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: 10%{?dist} URL: https://maxmind.github.io/libmaxminddb Source0: https://github.com/maxmind/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz @@ -18,6 +18,9 @@ The package contains libmaxminddb library. %package devel Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig +#the only binary in -devel subpackage has been moved to the main package +#this means that the -devel-debuginfo pkg is missing and it would interrupt update path +Obsoletes: libmaxminddb-devel-debuginfo < 1.2.0-8 Summary: Development header files for libmaxminddb %description devel @@ -44,6 +47,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 + +#if __WORDSIZE == 32 +#include +#elif __WORDSIZE == 64 +#include +#else +#error "Unknown word size" +#endif +EOF + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -51,19 +70,31 @@ rm -fv %{buildroot}%{_libdir}/*.la %files %license LICENSE %{_libdir}/libmaxminddb.so.* +%{_bindir}/mmdblookup +%{_mandir}/man1/mmdblookup.1.gz %files devel %license NOTICE %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 +* Mon Jun 08 2020 Michal Ruprich - 1.2.0-10 +- Related: #1642001 - Obsoleting -devel-debuginfo to enable clean update path + +* Mon May 25 2020 Michal Ruprich - 1.2.0-9 +- Related: #1642001 - moving manpage of mmdblookup from -devel subpackage + +* Fri May 15 2020 Michal Ruprich - 1.2.0-8 +- Resolves: #1642001 - binary mmdblookup is in libmaxminddb-devel + +* Thu Jan 09 2020 Michal Ruprich - 1.2.0-7 +- Resolves: #1788956 - conflicts with multilib install + * Thu Aug 02 2018 Michal Ruprich - 1.2.0-6 - Adding libmaxminddb as a new package to RHEL-8 (rhbz#1607927) - Adding Recommends tag for geolite2 databases