commit 11336aa6c1170f6e18bb40ff1ca09932c1575edf Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Thu Mar 30 21:43:43 2017 +0200
- new Source URL, updated to 2.1.8 (note: new sonames) - updated fpm,link patches - drop .la files libevent-fpm.patch | 16 +++++----------- libevent-link.patch | 10 +++++----- libevent.spec | 55 ++++++++++++++++++++++++++--------------------------- 3 files changed, 37 insertions(+), 44 deletions(-) --- diff --git a/libevent.spec b/libevent.spec index 620666c..e10909c 100644 --- a/libevent.spec +++ b/libevent.spec @@ -6,18 +6,19 @@ Summary: libevent - an event notification library Summary(pl.UTF-8): libevent - biblioteka powiadamiajÄ…ca o zdarzeniach Name: libevent -Version: 2.0.22 +Version: 2.1.8 Release: 1 License: BSD Group: Libraries -Source0: http://downloads.sourceforge.net/levent/%{name}-%{version}-stable.tar.gz -# Source0-md5: c4c56f986aa985677ca1db89630a2e11 +#Source0Download: https://github.com/libevent/libevent/releases +Source0: https://github.com/libevent/libevent/releases/download/release-%{version}-stable/%{name}-%{version}-stable.tar.gz +# Source0-md5: f3eeaed018542963b7d2416ef1135ecc Patch0: %{name}-fpm.patch Patch1: %{name}-link.patch URL: http://libevent.org/ BuildRequires: autoconf >= 2.60 -BuildRequires: automake -BuildRequires: libtool +BuildRequires: automake >= 1:1.9 +BuildRequires: libtool >= 1:1.4.3 BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: zlib-devel @@ -72,6 +73,7 @@ Statyczna biblioteka libevent. %{__autoconf} %{__automake} %configure \ + --disable-silent-rules \ %{!?with_static_libs:--disable-static} %{__make} @@ -82,10 +84,13 @@ install -d $RPM_BUILD_ROOT/%{_lib} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -mv -f $RPM_BUILD_ROOT%{_libdir}/libevent-2.0.so.* $RPM_BUILD_ROOT/%{_lib} -ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libevent-2.0.so.*.*.*) \ +%{__mv} $RPM_BUILD_ROOT%{_libdir}/libevent-2.1.so.* $RPM_BUILD_ROOT/%{_lib} +ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libevent-2.1.so.*.*.*) \ $RPM_BUILD_ROOT%{_libdir}/libevent.so +# obsoleted by pkg-config +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libevent*.la + %clean rm -rf $RPM_BUILD_ROOT @@ -94,17 +99,17 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog LICENSE README -%attr(755,root,root) /%{_lib}/libevent-2.0.so.*.*.* -%attr(755,root,root) %ghost /%{_lib}/libevent-2.0.so.5 -%attr(755,root,root) %{_libdir}/libevent_core-2.0.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libevent_core-2.0.so.5 -%attr(755,root,root) %{_libdir}/libevent_extra-2.0.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libevent_extra-2.0.so.5 -%attr(755,root,root) %{_libdir}/libevent_openssl-2.0.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libevent_openssl-2.0.so.5 -%attr(755,root,root) %{_libdir}/libevent_pthreads-2.0.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libevent_pthreads-2.0.so.5 +%doc ChangeLog* LICENSE +%attr(755,root,root) /%{_lib}/libevent-2.1.so.*.*.* +%attr(755,root,root) %ghost /%{_lib}/libevent-2.1.so.6 +%attr(755,root,root) %{_libdir}/libevent_core-2.1.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libevent_core-2.1.so.6 +%attr(755,root,root) %{_libdir}/libevent_extra-2.1.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libevent_extra-2.1.so.6 +%attr(755,root,root) %{_libdir}/libevent_openssl-2.1.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libevent_openssl-2.1.so.6 +%attr(755,root,root) %{_libdir}/libevent_pthreads-2.1.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libevent_pthreads-2.1.so.6 %files devel %defattr(644,root,root,755) @@ -115,21 +120,15 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libevent_extra.so %attr(755,root,root) %{_libdir}/libevent_openssl.so %attr(755,root,root) %{_libdir}/libevent_pthreads.so -%{_libdir}/libevent.la -%{_libdir}/libevent_core.la -%{_libdir}/libevent_extra.la -%{_libdir}/libevent_openssl.la -%{_libdir}/libevent_pthreads.la -%dir %{_includedir}/event2 -%{_includedir}/event2/*.h +%{_includedir}/event2 %{_includedir}/evdns.h -%{_includedir}/event*.h +%{_includedir}/event.h %{_includedir}/evhttp.h %{_includedir}/evrpc.h %{_includedir}/evutil.h -#%%{_mandir}/man3/evdns.3* -#%%{_mandir}/man3/event.3* %{_pkgconfigdir}/libevent.pc +%{_pkgconfigdir}/libevent_core.pc +%{_pkgconfigdir}/libevent_extra.pc %{_pkgconfigdir}/libevent_openssl.pc %{_pkgconfigdir}/libevent_pthreads.pc diff --git a/libevent-fpm.patch b/libevent-fpm.patch index f897b14..5b77ddf 100644 --- a/libevent-fpm.patch +++ b/libevent-fpm.patch @@ -1,19 +1,13 @@ ---- libevent-2.0.3-alpha/event.c~ 2009-11-19 17:43:22.000000000 +0000 -+++ libevent-2.0.3-alpha/event.c 2009-11-24 15:02:31.550484522 +0000 -@@ -460,16 +460,10 @@ +--- libevent-2.1.8-stable/event.c.orig 2017-03-29 21:29:06.089923271 +0200 ++++ libevent-2.1.8-stable/event.c 2017-03-29 21:31:33.269921590 +0200 +@@ -881,10 +881,6 @@ if (base->evsel != NULL && base->evsel->dealloc != NULL) base->evsel->dealloc(base); - for (i = 0; i < base->nactivequeues; ++i) - EVUTIL_ASSERT(TAILQ_EMPTY(&base->activequeues[i])); - -- EVUTIL_ASSERT(min_heap_empty(&base->timeheap)); - min_heap_dtor(&base->timeheap); +- EVUTIL_ASSERT(min_heap_empty_(&base->timeheap)); + min_heap_dtor_(&base->timeheap); mm_free(base->activequeues); - -- EVUTIL_ASSERT(TAILQ_EMPTY(&base->eventqueue)); -- - evmap_io_clear(&base->io); - evmap_signal_clear(&base->sigmap); - diff --git a/libevent-link.patch b/libevent-link.patch index cf5168e..71a03c5 100644 --- a/libevent-link.patch +++ b/libevent-link.patch @@ -1,6 +1,6 @@ ---- libevent-2.0.12-stable/Makefile.am~ 2011-06-03 21:45:36.000000000 +0200 -+++ libevent-2.0.12-stable/Makefile.am 2011-06-07 09:08:30.650818312 +0200 -@@ -193,17 +193,17 @@ +--- libevent-2.1.8-stable/Makefile.am.orig 2017-03-29 21:45:17.746578843 +0200 ++++ libevent-2.1.8-stable/Makefile.am 2017-03-29 21:49:07.416576220 +0200 +@@ -240,17 +240,17 @@ if PTHREADS libevent_pthreads_la_SOURCES = evthread_pthread.c @@ -9,7 +9,7 @@ libevent_pthreads_la_LDFLAGS = $(GENERIC_LDFLAGS) endif - libevent_extra_la_SOURCES = $(EXTRA_SRC) + libevent_extra_la_SOURCES = $(EXTRAS_SRC) -libevent_extra_la_LIBADD = $(MAYBE_CORE) $(SYS_LIBS) +libevent_extra_la_LIBADD = $(MAYBE_CORE) $(SYS_LIBS) libevent.la libevent_extra_la_LDFLAGS = $(GENERIC_LDFLAGS) @@ -19,5 +19,5 @@ -libevent_openssl_la_LIBADD = $(MAYBE_CORE) $(OPENSSL_LIBS) +libevent_openssl_la_LIBADD = $(MAYBE_CORE) $(OPENSSL_LIBS) libevent.la libevent_openssl_la_LDFLAGS = $(GENERIC_LDFLAGS) + libevent_openssl_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENSSL_INCS) endif - ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libevent.git/commitdiff/11336aa6c1170f6e18bb40ff1ca09932c1575edf _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit