Update to 2.0.22

- Spec cleanup, new URL
- Support multilib devel (bug #477685)

.gitignore

@@ -1,2 +1,3 @@
 /libevent-2.0.18-stable.tar.gz
 /libevent-2.0.21-stable.tar.gz
+/libevent-2.0.22-stable.tar.gz

libevent-2.0.10-stable-configure.patch

@@ -1,25 +0,0 @@
-diff -up libevent-2.0.12-stable/configure.in.orig libevent-2.0.12-stable/configure.in
---- libevent-2.0.12-stable/configure.in.orig	2011-06-03 15:43:34.000000000 -0400
-+++ libevent-2.0.12-stable/configure.in	2011-08-02 10:23:25.713704595 -0400
-@@ -341,8 +341,6 @@ AC_CHECK_FUNC(gethostbyname_r, [
- 
- fi
- 
--AC_CHECK_SIZEOF(long)
--
- AC_MSG_CHECKING(for F_SETFD in fcntl.h)
- AC_EGREP_CPP(yes,
- [
-@@ -519,12 +517,7 @@ AC_CHECK_TYPES([fd_mask], , ,
- #include <sys/select.h>
- #endif])
- 
--AC_CHECK_SIZEOF(long long)
--AC_CHECK_SIZEOF(long)
--AC_CHECK_SIZEOF(int)
--AC_CHECK_SIZEOF(short)
- AC_CHECK_SIZEOF(size_t)
--AC_CHECK_SIZEOF(void *)
- 
- AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t, struct addrinfo, struct sockaddr_storage], , ,
- [#define _GNU_SOURCE

libevent.spec

@@ -1,22 +1,21 @@
-%if 0%{?fedora} && 0%{?fedora} >= 20
+%if 0%{?fedora}
 %global develdocdir %{_docdir}/%{name}-devel
 %else
 %global develdocdir %{_docdir}/%{name}-devel-%{version}
 %endif
 
 Name:           libevent
-Version:        2.0.21
-Release:        8%{?dist}
+Version:        2.0.22
+Release:        1%{?dist}
 Summary:        Abstract asynchronous event notification library
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://sourceforge.net/projects/levent/        
-Source0:        http://downloads.sourceforge.net/levent/%{name}-%{version}-stable.tar.gz
+URL:            http://libevent.org/
+Source0:        https://github.com/libevent/libevent/releases/download/release-%{version}-stable/libevent-%{version}-stable.tar.gz
 
 BuildRequires: doxygen openssl-devel
 
-Patch00: libevent-2.0.10-stable-configure.patch
 # Disable network tests
 Patch01: libevent-nonettests.patch
 
@@ -47,9 +46,6 @@ This package contains the development documentation for %{name}.
 
 %prep
 %setup -q -n libevent-%{version}-stable
-
-# 477685 -  libevent-devel multilib conflict
-%patch00 -p1
 %patch01 -p1 -b .nonettests
 
 %build
@@ -61,10 +57,24 @@ make %{?_smp_mflags} all
 make doxygen
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# Fix multilib install of devel (bug #477685)
+mv $RPM_BUILD_ROOT%{_includedir}/event2/event-config.h \
+   $RPM_BUILD_ROOT%{_includedir}/event2/event-config-%{__isa_bits}.h
+cat > $RPM_BUILD_ROOT%{_includedir}/event2/event-config.h << EOF
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include <event2/event-config-32.h>
+#elif __WORDSIZE == 64
+#include <event2/event-config-64.h>
+#else
+#error "Unknown word size"
+#endif
+EOF
+
 mkdir -p $RPM_BUILD_ROOT/%{develdocdir}/html
 (cd doxygen/html; \
 	install -p -m 644 *.* $RPM_BUILD_ROOT/%{develdocdir}/html)
@@ -73,9 +83,6 @@ mkdir -p $RPM_BUILD_ROOT/%{develdocdir}/sample
 (cd sample; \
 	install -p -m 644 *.c Makefile* $RPM_BUILD_ROOT/%{develdocdir}/sample)
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %check
 make check
 
@@ -84,7 +91,8 @@ make check
 %postun -p /sbin/ldconfig
 
 %files
-%doc ChangeLog LICENSE README
+%license LICENSE
+%doc ChangeLog README
 %{_libdir}/libevent-*.so.*
 %{_libdir}/libevent_core-*.so.*
 %{_libdir}/libevent_extra-*.so.*
@@ -113,6 +121,11 @@ make check
 %{develdocdir}/
 
 %changelog
+* Fri Jun 24 2016 Orion Poplawski <orion@cora.nwra.com> - 2.0.22-1
+- Update to 2.0.22
+- Spec cleanup, new URL
+- Support multilib devel (bug #477685)
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.21-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

sources

@@ -1 +1 @@
-b2405cc9ebf264aa47ff615d9de527a2  libevent-2.0.21-stable.tar.gz
+c4c56f986aa985677ca1db89630a2e11  libevent-2.0.22-stable.tar.gz