Author: duddits Date: Thu Feb 24 13:54:54 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- merge from DEVEL (successful one I hope)
- this has rel. 0.1, just check if it works and we can bump it to 1
- some clean up
---- Files affected:
packages/libevent:
libevent.spec (1.35 -> 1.36)
---- Diffs:
================================================================
Index: packages/libevent/libevent.spec
diff -u packages/libevent/libevent.spec:1.35 packages/libevent/libevent.spec:1.36
--- packages/libevent/libevent.spec:1.35 Thu Jan 6 22:05:05 2011
+++ packages/libevent/libevent.spec Thu Feb 24 14:54:48 2011
@@ -1,34 +1,28 @@
# $Revision$, $Date$
# TODO
# - %attr(755,root,root) %{_bindir}/event_rpcgen.py
-# - needs -levent: /usr/lib64/libevent_extra-1.4.so.2.1.3
#
# Conditional build:
%bcond_without static_libs # don't build static library
-%bcond_without dietlibc # don't build static dietlibc library
#
Summary: libevent - an event notification library
Summary(pl.UTF-8): libevent - biblioteka powiadamiająca o zdarzeniach
Name: libevent
-Version: 1.4.14b
-Release: 2
+Version: 2.0.10
+Release: 0.1
License: BSD
Group: Libraries
Source0: http://www.monkey.org/~provos/%{name}-%{version}-stable.tar.gz
-# Source0-md5: a00e037e4d3f9e4fe9893e8a2d27918c
+# Source0-md5: a37401d26cbbf28185211d582741a3d4
Patch0: %{name}-fpm.patch
-Patch1: %{name}.fb-changes.diff
-Patch2: %{name}-link.patch
URL: http://www.monkey.org/~provos/libevent/
BuildRequires: autoconf
BuildRequires: automake
-%{?with_dietlibc:BuildRequires: dietlibc-static >= 2:0.31-5}
BuildRequires: libtool
+BuildRequires: pkgconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# to get backslash, we need to escape it from spec parser. therefore "\\|" not "\|" here
-%define dietarch %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
-%define dietlibdir %{_prefix}/lib/dietlibc/lib-%{dietarch}
+%define skip_post_check_so libevent_pthreads-2.0.so.* libevent_extra-2.0.so.* libevent_openssl-2.0.so.*
%description
The libevent API provides a mechanism to execute a callback function
@@ -66,60 +60,25 @@
%description static -l pl.UTF-8
Statyczna biblioteka libevent.
-%package dietlibc
-Summary: Static dietlibc libevent library
-Summary(pl.UTF-8): Biblioteka statyczna dietlibc libevent
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description dietlibc
-Static dietlibc libevent library.
-
-%description dietlibc -l pl.UTF-8
-Biblioteka statyczna dietlibc libevent.
-
%prep
%setup -q -n %{name}-%{version}-stable
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__automake}
-%if %{with dietlibc}
-%configure \
- CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -D_BSD_SOURCE -D_EVENT_HAVE_FD_MASK" \
- --enable-static \
- --disable-shared
-
-# libtool sucks, build just the libs
-%{__make}
-mv .libs/libevent.a diet-libevent.a
-mv .libs/libevent_core.a diet-libevent_core.a
-mv .libs/libevent_extra.a diet-libevent_extra.a
-%{__make} clean
-%endif
-
%configure \
%{!?with_static_libs:--disable-static}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%if %{with dietlibc}
-install diet-libevent.a $RPM_BUILD_ROOT%{dietlibdir}/libevent.a
-install diet-libevent_core.a $RPM_BUILD_ROOT%{dietlibdir}/libevent_core.a
-install diet-libevent_extra.a $RPM_BUILD_ROOT%{dietlibdir}/libevent_extra.a
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -128,30 +87,43 @@
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libevent-1.4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libevent-1.4.so.2
-%attr(755,root,root) %{_libdir}/libevent_core-1.4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libevent_core-1.4.so.2
-%attr(755,root,root) %{_libdir}/libevent_extra-1.4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libevent_extra-1.4.so.2
+%attr(755,root,root) %{_libdir}/libevent-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/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
%files devel
%defattr(644,root,root,755)
# R: python
-#%attr(755,root,root) %{_bindir}/event_rpcgen.py
+%attr(755,root,root) %{_bindir}/event_rpcgen.py
%attr(755,root,root) %{_libdir}/libevent.so
%attr(755,root,root) %{_libdir}/libevent_core.so
%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}/evdns.h
%{_includedir}/event*.h
%{_includedir}/evhttp.h
%{_includedir}/evrpc.h
%{_includedir}/evutil.h
-%{_mandir}/man3/evdns.3*
-%{_mandir}/man3/event.3*
+#%%{_mandir}/man3/evdns.3*
+#%%{_mandir}/man3/event.3*
+%{_pkgconfigdir}/libevent.pc
+%{_pkgconfigdir}/libevent_openssl.pc
+%{_pkgconfigdir}/libevent_pthreads.pc
%if %{with static_libs}
%files static
@@ -159,14 +131,8 @@
%{_libdir}/libevent.a
%{_libdir}/libevent_core.a
%{_libdir}/libevent_extra.a
-%endif
-
-%if %{with dietlibc}
-%files dietlibc
-%defattr(644,root,root,755)
-%{dietlibdir}/libevent.a
-%{dietlibdir}/libevent_core.a
-%{dietlibdir}/libevent_extra.a
+%{_libdir}/libevent_openssl.a
+%{_libdir}/libevent_pthreads.a
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -175,6 +141,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2011/02/24 13:54:48 duddits
+- merge from DEVEL (successful one I hope)
+- this has rel. 0.1, just check if it works and we can bump it to 1
+- some clean up
+
Revision 1.35 2011/01/06 21:05:05 sparky
- added link patch
- auto*ize to enable link patch
@@ -203,6 +174,45 @@
Revision 1.28 2009/06/01 14:01:03 lisu
- up to 1.4.11
+
+Revision 1.27.2.9 2011/02/24 13:13:51 duddits
+- up to 2.0.10 (thanks marTi: marcin dot rybak at gmail dot com)
+- looks stable (see home page for details)
+- needs to be merged with HEAD as some packages will probably relay on this version
+
+Revision 1.27.2.8 2010/12/15 12:13:15 lisu
+- up to 2.0.9-rc
+- drop zero epoch
+- skip symbol checking for some broken libs
+- package more .pc files
+
+Revision 1.27.2.7 2010/09/14 07:24:37 lisu
+- 2.0.7-rc
+
+Revision 1.27.2.6 2010/08/16 13:06:28 lisu
+- up to 2.0.6-rc
+- new sonames version
+
+Revision 1.27.2.5 2010/05/13 09:09:49 lisu
+- updated to 2.0.5-beta
+- add libevent_openssl libraries
+- no manual pages
+
+Revision 1.27.2.4 2010/03/05 11:12:02 lisu
+- updated to 2.0.4-alpha
+- package libevent_openssl files
+
+Revision 1.27.2.3 2009/11/24 13:06:59 lisu
+- up to 2.0.3-alpha
+
+Revision 1.27.2.2 2009/08/04 08:01:31 lisu
+- up to 2.0.2-alpha
+- updated shared libraries
+
+Revision 1.27.2.1 2009/04/27 11:08:41 lisu
+- 2.0.1-alpha version
+- libevent_pthreads stuff
+- add *.pc
Revision 1.27 2009/04/27 10:18:45 lisu
- up to 1.4.10
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libevent/libevent.spec?r1=1.35&r2=1.36&f=u