diff --git a/libevent.spec b/libevent.spec index 1ba0451321eca0808539299e13bb3981dd531e32..774c38eb353077e994f7d5cc235a50bd8cfcc5b4 100644 --- a/libevent.spec +++ b/libevent.spec @@ -1,6 +1,6 @@ Name: libevent Version: 2.1.12 -Release: 4 +Release: 5 Summary: An event notification library License: BSD @@ -36,6 +36,21 @@ with %{name}. %make_install rm -f %{buildroot}%{_libdir}/*.la +# Fix multilib install of devel (bug #477685) +mv %{buildroot}%{_includedir}/event2/event-config.h \ + %{buildroot}%{_includedir}/event2/event-config-%{__isa_bits}.h +cat > %{buildroot}%{_includedir}/event2/event-config.h << EOF +#include + +#if __WORDSIZE == 32 +#include +#elif __WORDSIZE == 64 +#include +#else +#error "Unknown word size" +#endif +EOF + %check %make_build check @@ -68,6 +83,12 @@ rm -f %{buildroot}%{_libdir}/*.la %changelog +* Thu Oct 27 2022 dongyuzhen - 2.1.12-5 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix the installation conflict between x86 and i686 in event-config.h + * Wed Apr 21 2021 yangzhuangzhuang - 2.1.12-4 - Type:enhancement - ID:NA