rpms/libevent/devel libevent-1.4.12-stable-configure.patch, NONE, 1.1 libevent-1.4.12-stable-epoll.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 libevent.spec, 1.20, 1.21 sources, 1.8, 1.9
Steve Dickson
steved at fedoraproject.org
Tue Aug 18 20:33:44 UTC 2009
Author: steved
Update of /cvs/pkgs/rpms/libevent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19094
Modified Files:
.cvsignore libevent.spec sources
Added Files:
libevent-1.4.12-stable-configure.patch
libevent-1.4.12-stable-epoll.patch
Log Message:
- Updated to latest stable upstream version: 1.4.12
- API documentation is now installed (bz 487977)
- libevent-devel multilib conflict (bz 477685)
- epoll backend allocates too much memory (bz 517918)
libevent-1.4.12-stable-configure.patch:
configure.in | 5 -----
1 file changed, 5 deletions(-)
--- NEW FILE libevent-1.4.12-stable-configure.patch ---
diff -up libevent-1.4.12-stable/configure.in.orig libevent-1.4.12-stable/configure.in
--- libevent-1.4.12-stable/configure.in.orig 2009-07-24 22:16:55.000000000 -0400
+++ libevent-1.4.12-stable/configure.in 2009-08-18 15:54:26.925112000 -0400
@@ -138,8 +138,6 @@ AC_HEADER_TIME
dnl Checks for library functions.
AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop signal sigaction strtoll)
-AC_CHECK_SIZEOF(long)
-
if test "x$ac_cv_func_clock_gettime" = "xyes"; then
AC_DEFINE(DNS_USE_CPU_CLOCK_FOR_ID, 1, [Define if clock_gettime is available in libc])
else
@@ -309,9 +307,6 @@ AC_CHECK_TYPES([uint64_t, uint32_t, uint
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif])
-AC_CHECK_SIZEOF(long long)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(short)
AC_CHECK_TYPES([struct in6_addr], , ,
[#ifdef WIN32
#include <winsock2.h>
libevent-1.4.12-stable-epoll.patch:
epoll.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE libevent-1.4.12-stable-epoll.patch ---
diff -up libevent-1.4.12-stable/epoll.c.orig libevent-1.4.12-stable/epoll.c
--- libevent-1.4.12-stable/epoll.c.orig 2009-07-02 02:05:28.000000000 -0400
+++ libevent-1.4.12-stable/epoll.c 2009-08-18 16:13:31.672097000 -0400
@@ -115,6 +115,7 @@ epoll_init(struct event_base *base)
if (getenv("EVENT_NOEPOLL"))
return (NULL);
+#ifndef linux
if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
rl.rlim_cur != RLIM_INFINITY) {
/*
@@ -124,6 +125,7 @@ epoll_init(struct event_base *base)
*/
nfiles = rl.rlim_cur - 1;
}
+#endif
/* Initalize the kernel queue */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore 20 Apr 2009 16:10:05 -0000 1.8
+++ .cvsignore 18 Aug 2009 20:33:43 -0000 1.9
@@ -5,3 +5,4 @@ libevent-1.3e.tar.gz
libevent-1.4.4-stable.tar.gz
libevent-1.4.5-stable.tar.gz
libevent-1.4.10-stable.tar.gz
+libevent-1.4.12-stable.tar.gz
Index: libevent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/libevent.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libevent.spec 25 Jul 2009 05:35:20 -0000 1.20
+++ libevent.spec 18 Aug 2009 20:33:43 -0000 1.21
@@ -1,6 +1,6 @@
Name: libevent
-Version: 1.4.10
-Release: 2%{?dist}
+Version: 1.4.12
+Release: 1%{?dist}
Summary: Abstract asynchronous event notification library
Group: System Environment/Libraries
@@ -9,6 +9,9 @@ URL: http://monkey.org/~provo
Source0: http://monkey.org/~provos/libevent-%{version}-stable.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch00: libevent-1.4.12-stable-configure.patch
+Patch01: libevent-1.4.12-stable-epoll.patch
+
%description
The libevent API provides a mechanism to execute a callback function
when a specific event occurs on a file descriptor or after a timeout
@@ -31,16 +34,40 @@ you will need to install %{name}-devel.
%prep
%setup -q -n libevent-%{version}-stable
+# 477685 - libevent-devel multilib conflict
+%patch00 -p1
+# 517918 - epoll backend allocates too much memory
+%patch01 -p1
+
%build
%configure \
--disable-dependency-tracking
make %{?_smp_mflags}
+# Create the docs
+make doxygen
+
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html
+(cd doxygen/html; \
+ install *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html)
+
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/latex
+(cd doxygen/latex; \
+ install *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/latex)
+
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/man/man3
+(cd doxygen/man/man3; \
+ install *.3 $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/man/man3)
+
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample
+(cd sample; \
+ install *.c Makefile* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample)
+
%check
make verify
@@ -60,7 +87,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,0755)
-%doc sample/*.c
%{_includedir}/event.h
%{_includedir}/evdns.h
%{_includedir}/evhttp.h
@@ -78,7 +104,18 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
+%{_docdir}/%{name}-devel-%{version}/html/*
+%{_docdir}/%{name}-devel-%{version}/latex/*
+%{_docdir}/%{name}-devel-%{version}/man/man3/*
+%{_docdir}/%{name}-devel-%{version}/sample/*
+
%changelog
+* Tue Aug 18 2009 Steve Dickson <steved at redhat.com> 1.4.12-1
+- Updated to latest stable upstream version: 1.4.12
+- API documentation is now installed (bz 487977)
+- libevent-devel multilib conflict (bz 477685)
+- epoll backend allocates too much memory (bz 517918)
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libevent/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 20 Apr 2009 16:10:05 -0000 1.8
+++ sources 18 Aug 2009 20:33:43 -0000 1.9
@@ -1 +1 @@
-20611535f26d415bd6ad380a673d9ea2 libevent-1.4.10-stable.tar.gz
+77b0d8b9885496871bb083165b35ba11 libevent-1.4.12-stable.tar.gz
More information about the fedora-extras-commits
mailing list